Commit 9842e82e authored by Jérome Perrin's avatar Jérome Perrin

web_shadir: PY3 compatibility

parent 514c2611
...@@ -44,10 +44,9 @@ class ShaDirMixin(object): ...@@ -44,10 +44,9 @@ class ShaDirMixin(object):
Initialize the ERP5 site. Initialize the ERP5 site.
""" """
self.login() self.login()
self.portal = self.getPortal()
self.key = 'mykey' + str(random.random()) self.key = 'mykey' + str(random.random())
self.file_content = 'This is the content.' self.file_content = b'This is the content.'
self.file_sha512sum = hashlib.sha512(self.file_content).hexdigest() self.file_sha512sum = hashlib.sha512(self.file_content).hexdigest()
self.distribution = 'pypi' self.distribution = 'pypi'
self.creation_date = DateTime() self.creation_date = DateTime()
...@@ -62,14 +61,14 @@ class ShaDirMixin(object): ...@@ -62,14 +61,14 @@ class ShaDirMixin(object):
'expiration_date': str(self.expiration_date), 'expiration_date': str(self.expiration_date),
'distribution': self.distribution, 'distribution': self.distribution,
'architecture': self.architecture}), 'architecture': self.architecture}),
b64encode("User SIGNATURE goes here.")] b64encode(b"User SIGNATURE goes here.").decode()]
self.data = json.dumps(self.data_list) self.data = json.dumps(self.data_list).encode()
self.sha512sum = hashlib.sha512(self.data).hexdigest() self.sha512sum = hashlib.sha512(self.data).hexdigest()
self.header_dict = { self.header_dict = {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': 'Basic ' + b64encode('ERP5TypeTestCase:'), 'Authorization': 'Basic ' + b64encode(b'ERP5TypeTestCase:').decode(),
} }
module = self.portal.web_site_module module = self.portal.web_site_module
......
...@@ -63,7 +63,7 @@ class TestShaDir(ShaDirMixin, ERP5TypeTestCase): ...@@ -63,7 +63,7 @@ class TestShaDir(ShaDirMixin, ERP5TypeTestCase):
finally: finally:
connection.close() connection.close()
self.assertEqual(result.status, six.moves.http_client.CREATED) self.assertEqual(result.status, six.moves.http_client.CREATED)
self.assertEqual(data, '') self.assertEqual(data, b'')
def getInformation(self, key=None): def getInformation(self, key=None):
""" """
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment