Merge lp:~dobey/ubuntuone-storage-protocol/update-4-0 into lp:ubuntuone-storage-protocol/stable-4-0

[dobey]

[Alejandro Cura]

    - Add the ValiCert certificate to the custom certificates (LP: #882062).

[Rodney Dawes]

    - Patch get_certificates to use the uninstalled certificates when testing.

[Roberto Alsina (ralsina)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-storage-protocol/update-4-0 into lp:ubuntuone-storage-protocol/stable-4-0 failed. Below is the output from the failed tests.

running build
running build_py
creating build
creating build/lib.linux-x86_64-2.7
creating build/lib.linux-x86_64-2.7/ubuntuone
copying ubuntuone/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone
creating build/lib.linux-x86_64-2.7/ubuntuone/storageprotocol
copying ubuntuone/storageprotocol/content_hash.py -> build/lib.linux-x86_64-2.7/ubuntuone/storageprotocol
copying ubuntuone/storageprotocol/delta.py -> build/lib.linux-x86_64-2.7/ubuntuone/storageprotocol
copying ubuntuone/storageprotocol/dircontent_pb2.py -> build/lib.linux-x86_64-2.7/ubuntuone/storageprotocol
copying ubuntuone/storageprotocol/protocol_pb2.py -> build/lib.linux-x86_64-2.7/ubuntuone/storageprotocol
copying ubuntuone/storageprotocol/proxy_tunnel.py -> build/lib.linux-x86_64-2.7/ubuntuone/storageprotocol
copying ubuntuone/storageprotocol/dircontent.py -> build/lib.linux-x86_64-2.7/ubuntuone/storageprotocol
copying ubuntuone/storageprotocol/volumes.py -> build/lib.linux-x86_64-2.7/ubuntuone/storageprotocol
copying ubuntuone/storageprotocol/client.py -> build/lib.linux-x86_64-2.7/ubuntuone/storageprotocol
copying ubuntuone/storageprotocol/request.py -> build/lib.linux-x86_64-2.7/ubuntuone/storageprotocol
copying ubuntuone/storageprotocol/__init__.py -> build/lib.linux-x86_64-2.7/ubuntuone/storageprotocol
copying ubuntuone/storageprotocol/errors.py -> build/lib.linux-x86_64-2.7/ubuntuone/storageprotocol
copying ubuntuone/storageprotocol/sharersp.py -> build/lib.linux-x86_64-2.7/ubuntuone/storageprotocol
copying ubuntuone/storageprotocol/validators.py -> build/lib.linux-x86_64-2.7/ubuntuone/storageprotocol
copying ubuntuone/storageprotocol/context.py -> build/lib.linux-x86_64-2.7/ubuntuone/storageprotocol
copying ubuntuone/storageprotocol/utils.py -> build/lib.linux-x86_64-2.7/ubuntuone/storageprotocol
tests.test_delta_info
  DeltaTestCase
    test_correct_attributes ... [OK]
    test_is_equal ... [OK]
    test_parent_id_None ... [OK]
    test_root_share_id ... [OK]
tests.test_query
  TestQuery10
    test_query_many ... [OK]
  TestQuery1000
    test_query_many ... [OK]
tests.test_hashes
  ContentHashingTests
    test_content_hash ... [OK]
    test_hashing_content_once ... [OK]
    test_hashing_content_upadting ... [OK]
    test_hashing_empty ... [OK]
  FactoriesTest
    test_content_hash_factory ... [OK]
    test_content_hash_method ... [OK]
    test_content_hash_method_name ... [OK]
    test_magic_hash_factory ... ...

[lp:~dobey/ubuntuone-storage-protocol/update-4-0]

149. By dobey on 2012-06-26

[Alejandro Cura]

    - Add the ValiCert certificate to the custom certificates (LP: #882062).

[Rodney Dawes]

    - Patch get_certificates to use the uninstalled certificates when testing.

=== added file 'data/ValiCert_Class_2_VA.pem'
--- data/ValiCert_Class_2_VA.pem	1970-01-01 00:00:00 +0000
+++ data/ValiCert_Class_2_VA.pem	2012-06-26 02:07:19 +0000
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
+NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
+dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
+WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
+v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
+UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
+IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
+W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
+-----END CERTIFICATE-----

=== modified file 'setup.py'
--- setup.py	2012-06-08 20:15:59 +0000
+++ setup.py	2012-06-26 02:07:19 +0000
@@ -76,6 +76,7 @@
       extra_path='ubuntuone-storage-protocol',
       data_files=[(ssl_cert_location,
                    ['data/UbuntuOne-Go_Daddy_CA.pem',
+                    'data/ValiCert_Class_2_VA.pem',
                     'data/UbuntuOne-Go_Daddy_Class_2_CA.pem'])],
 
       cmdclass={

=== modified file 'tests/test_context.py'
--- tests/test_context.py	2012-06-08 19:18:15 +0000
+++ tests/test_context.py	2012-06-26 02:07:19 +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())

=== modified file 'tests/test_dircontent.py'
--- tests/test_dircontent.py	2012-03-29 20:28:09 +0000
+++ tests/test_dircontent.py	2012-06-26 02:07:19 +0000
@@ -96,7 +96,7 @@
         self.assert_(a == a)
         self.assert_(a == a2)
         self.assert_(a != b)
-        self.assert_(a != None)
+        self.assert_(a is not None)
 
     def testEntryName(self):
         """Verify that name and utf8_name are encoded and decoded properly."""

=== modified file 'ubuntuone/storageprotocol/client.py'
--- ubuntuone/storageprotocol/client.py	2012-03-29 20:28:09 +0000
+++ ubuntuone/storageprotocol/client.py	2012-06-26 02:07:19 +0000
@@ -1730,8 +1730,8 @@
         """
         delayed_call = getattr(self, call_id)
         # check if we already have a DelayedCall running
-        if delayed_call is None or (not delayed_call.active() \
-           and delayed_call.cancelled):
+        if delayed_call is None or (not delayed_call.active()
+                                    and delayed_call.cancelled):
             return self.callLater(period, func)
         return delayed_call
 

=== modified file 'ubuntuone/storageprotocol/context.py'
--- ubuntuone/storageprotocol/context.py	2012-06-08 19:18:15 +0000
+++ ubuntuone/storageprotocol/context.py	2012-06-26 02:07:19 +0000
@@ -92,7 +92,9 @@
                      'UbuntuOne-Go_Daddy_Class_2_CA.pem'), 'r').read())
     ca_file_2 = ssl.Certificate.loadPEM(file(os.path.join(ssl_cert_location,
                     'UbuntuOne-Go_Daddy_CA.pem'), 'r').read())
-    return [ca_file.original, ca_file_2.original]
+    ca_file_3 = ssl.Certificate.loadPEM(file(os.path.join(ssl_cert_location,
+                    'ValiCert_Class_2_VA.pem'), 'r').read())
+    return [ca_file.original, ca_file_2.original, ca_file_3.original]
 
 
 def get_ssl_context(no_verify, hostname=None):