Merge lp:~dobey/ubuntuone-storage-protocol/fix-context-test into lp:ubuntuone-storage-protocol

[dobey]

Patch get_certificates to use the uninstalled certificates when testing

To test this locally, you'll have to apt-get remove --purge python-ubuntuone-storageprotocol (so that the certs are not installed in the system location). Without this branch, the trunk tests will fail on test_fails_certificate.

[lp:~dobey/ubuntuone-storage-protocol/fix-context-test]

150. By dobey on 2012-06-11

Actually, let's just do this for all the tests, and not just one

[Alejandro J. Cura (alecu)]

Looks good!

review: Approve

=== modified file 'tests/test_context.py'
--- tests/test_context.py	2012-06-08 14:05:42 +0000
+++ tests/test_context.py	2012-06-11 17:29:17 +0000
@@ -117,6 +117,21 @@
     """Tests for the context.get_ssl_context function."""
 
     @defer.inlineCallbacks
+    def setUp(self):
+        yield super(SSLContextTestCase, self).setUp()
+        self.patch(context, "get_certificates", self.get_certificates)
+
+    def get_certificates(self):
+        """Get the uninstalled certificates, for testing."""
+        ca_1 = ssl.Certificate.loadPEM(file(os.path.abspath(os.path.join(
+                        os.pardir, os.pardir, 'data',
+                        'UbuntuOne-Go_Daddy_Class_2_CA.pem')), 'r').read())
+        ca_2 = ssl.Certificate.loadPEM(file(os.path.abspath(os.path.join(
+                        os.pardir, os.pardir, 'data',
+                        'UbuntuOne-Go_Daddy_CA.pem')), 'r').read())
+        return [ca_1.original, ca_2.original]
+
+    @defer.inlineCallbacks
     def verify_context(self, server_context, client_context):
         """Verify a client context with a given server context."""
         site = server.Site(FakeResource())