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

[Vincent Ladeuil]

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

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).

[Martin Pool (mbp)]

review: Approve

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'NEWS'
--- NEWS	2010-09-27 15:03:28 +0000
+++ NEWS	2010-09-30 08:56:02 +0000
@@ -41,6 +41,10 @@
 Testing
 *******
 
+* Add ``tests/ssl_certs/ca.crt`` to the required test files list. Test
+  involving the pycurl https test server fail otherwise when running
+  selftest from an installed version. (Vincent Ladeuil, #651706)
+
 * Fix tests that failed when run under ``LANG=C``.
   (Andrew Bennetts, #632387)
 

=== 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 @@
             'package_data': {'bzrlib': ['doc/api/*.txt',
                                         'tests/test_patches_data/*',
                                         'help_topics/en/*.txt',
+                                        'tests/ssl_certs/ca.crt',
                                         'tests/ssl_certs/server_without_pass.key',
                                         'tests/ssl_certs/server_with_pass.key',
                                         'tests/ssl_certs/server.crt'