Browse Source

OpenSSL tests works on Python 3 again. Closes #2040

Ask Solem 9 years ago
parent
commit
0c8c7df4e3
2 changed files with 2 additions and 3 deletions
  1. 0 2
      celery/tests/security/case.py
  2. 2 1
      celery/tests/security/test_serialization.py

+ 0 - 2
celery/tests/security/case.py

@@ -8,8 +8,6 @@ import sys
 class SecurityCase(AppCase):
 
     def setup(self):
-        if sys.version_info[0] == 3:
-            raise SkipTest('PyOpenSSL does not work on Python 3')
         try:
             from OpenSSL import crypto  # noqa
         except ImportError:

+ 2 - 1
celery/tests/security/test_serialization.py

@@ -4,6 +4,7 @@ import os
 import base64
 
 from kombu.serialization import registry
+from kombu.utils.encoding import bytes_to_str
 
 from celery.exceptions import SecurityError
 from celery.security.serialization import SecureSerializer, register_auth
@@ -59,6 +60,6 @@ class test_SecureSerializer(SecurityCase):
 
     def test_lots_of_sign(self):
         for i in range(1000):
-            rdata = base64.urlsafe_b64encode(os.urandom(265))
+            rdata = bytes_to_str(base64.urlsafe_b64encode(os.urandom(265)))
             s = self._get_s(KEY1, CERT1, [CERT1])
             self.assertEqual(s.deserialize(s.serialize(rdata)), rdata)