Bazaar

Merge lp:~vila/bzr/651706-test-ca-crt into lp:bzr/2.2

  1. 651706-test-ca-crt
  2. Merge into 2.2
Proposed by Vincent Ladeuil
Status: Merged
Approved by: Martin Pool
Approved revision: no longer in the source branch.
Merged at revision: 5098
Proposed branch: lp:~vila/bzr/651706-test-ca-crt
Merge into: lp:bzr/2.2
Diff against target: 26 lines (+5/-0)
2 files modified
NEWS (+4/-0)
setup.py (+1/-0)
To merge this branch: bzr merge lp:~vila/bzr/651706-test-ca-crt
Reviewer Review Type Date Requested Status
Martin Pool Approve
Review via email: mp+37109@code.launchpad.net

Commit message

Add ``tests/ssl_certs/ca.crt to the required test files list.

Description of the change

The bzrlib/tests/ssl_certs/ca.crt was not installed, making some pycurl https tests fail.

I manually tested that adding this file along the other ones installed fix the issue.

This would help running the tests during the build phase for 2.2 (if needed, the fix is easy enough to backport to the 2.1 and 2.0 series).

To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) :
review: Approve
Revision history for this message
Vincent Ladeuil (vila) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2010-09-27 15:03:28 +0000
+++ NEWS 2010-09-30 08:56:02 +0000
@@ -41,6 +41,10 @@
41Testing41Testing
42*******42*******
4343
44* Add ``tests/ssl_certs/ca.crt`` to the required test files list. Test
45 involving the pycurl https test server fail otherwise when running
46 selftest from an installed version. (Vincent Ladeuil, #651706)
47
44* Fix tests that failed when run under ``LANG=C``.48* Fix tests that failed when run under ``LANG=C``.
45 (Andrew Bennetts, #632387)49 (Andrew Bennetts, #632387)
4650
4751
=== modified file 'setup.py'
--- setup.py 2010-08-02 19:56:52 +0000
+++ setup.py 2010-09-30 08:56:02 +0000
@@ -66,6 +66,7 @@
66 'package_data': {'bzrlib': ['doc/api/*.txt',66 'package_data': {'bzrlib': ['doc/api/*.txt',
67 'tests/test_patches_data/*',67 'tests/test_patches_data/*',
68 'help_topics/en/*.txt',68 'help_topics/en/*.txt',
69 'tests/ssl_certs/ca.crt',
69 'tests/ssl_certs/server_without_pass.key',70 'tests/ssl_certs/server_without_pass.key',
70 'tests/ssl_certs/server_with_pass.key',71 'tests/ssl_certs/server_with_pass.key',
71 'tests/ssl_certs/server.crt'72 'tests/ssl_certs/server.crt'

Subscribers

People subscribed via source and target branches