Skip to content

S
slapos.core
Commit 3e5f56eb authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

SSL certificate escape utf-8

parent 6c9d9b5f
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCloudWorkflow.py
View file @ 3e5f56eb
...@@ -143,7 +143,7 @@ class TestSlapOSCoreComputerSlapInterfaceWorkflow(testSlapOSMixin): ...@@ -143,7 +143,7 @@ class TestSlapOSCoreComputerSlapInterfaceWorkflow(testSlapOSMixin):
self.assertNotEqual(None, self.computer.getDestinationReference()) self.assertNotEqual(None, self.computer.getDestinationReference())
serial = '0x%x' % int(self.computer.getDestinationReference(), 16) serial = '0x%x' % int(self.computer.getDestinationReference(), 16)
self.assertTrue(serial in computer_certificate) self.assertTrue(serial in computer_certificate)
self.assertTrue(self.computer.getReference() in computer_certificate) self.assertTrue(self.computer.getReference() in computer_certificate.decode('string_escape'))
def test_generateCertificate_twice(self): def test_generateCertificate_twice(self):
self.login(self.computer.getReference()) self.login(self.computer.getReference())
...@@ -155,7 +155,7 @@ class TestSlapOSCoreComputerSlapInterfaceWorkflow(testSlapOSMixin): ...@@ -155,7 +155,7 @@ class TestSlapOSCoreComputerSlapInterfaceWorkflow(testSlapOSMixin):
self.assertNotEqual(None, self.computer.getDestinationReference()) self.assertNotEqual(None, self.computer.getDestinationReference())
serial = '0x%x' % int(self.computer.getDestinationReference(), 16) serial = '0x%x' % int(self.computer.getDestinationReference(), 16)
self.assertTrue(serial in computer_certificate) self.assertTrue(serial in computer_certificate)
self.assertTrue(self.computer.getReference() in computer_certificate) self.assertTrue(self.computer.getReference() in computer_certificate.decode('string_escape'))
self.assertRaises(ValueError, self.computer.generateCertificate) self.assertRaises(ValueError, self.computer.generateCertificate)
self.assertEqual(None, self.portal.REQUEST.get('computer_key')) self.assertEqual(None, self.portal.REQUEST.get('computer_key'))
...@@ -344,7 +344,7 @@ class TestSlapOSCoreComputerSlapInterfaceWorkflow(testSlapOSMixin): ...@@ -344,7 +344,7 @@ class TestSlapOSCoreComputerSlapInterfaceWorkflow(testSlapOSMixin):
self.assertNotEqual(None, self.computer.getDestinationReference()) self.assertNotEqual(None, self.computer.getDestinationReference())
serial = '0x%x' % int(self.computer.getDestinationReference(), 16) serial = '0x%x' % int(self.computer.getDestinationReference(), 16)
self.assertTrue(serial in computer_certificate) self.assertTrue(serial in computer_certificate)
self.assertTrue(self.computer.getReference() in computer_certificate) self.assertTrue(self.computer.getReference() in computer_certificate.decode('string_escape'))
self.computer.revokeCertificate() self.computer.revokeCertificate()
self.assertEqual(None, self.portal.REQUEST.get('computer_key')) self.assertEqual(None, self.portal.REQUEST.get('computer_key'))
...@@ -369,7 +369,7 @@ class TestSlapOSCoreComputerSlapInterfaceWorkflow(testSlapOSMixin): ...@@ -369,7 +369,7 @@ class TestSlapOSCoreComputerSlapInterfaceWorkflow(testSlapOSMixin):
self.assertNotEqual(None, self.computer.getDestinationReference()) self.assertNotEqual(None, self.computer.getDestinationReference())
serial = '0x%x' % int(self.computer.getDestinationReference(), 16) serial = '0x%x' % int(self.computer.getDestinationReference(), 16)
self.assertTrue(serial in computer_certificate) self.assertTrue(serial in computer_certificate)
self.assertTrue(self.computer.getReference() in computer_certificate) self.assertTrue(self.computer.getReference() in computer_certificate.decode('string_escape'))
self.computer.revokeCertificate() self.computer.revokeCertificate()
self.assertEqual(None, self.portal.REQUEST.get('computer_key')) self.assertEqual(None, self.portal.REQUEST.get('computer_key'))
......
master/bt5/slapos_cloud/bt/revision
View file @ 3e5f56eb
282 283
\ No newline at end of file \ No newline at end of file
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7