Fix order of arguments in assertEqual
Some tests used incorrect order assertEqual(observed, expected). The correct order expected by testtools is assertEqual(expected, observed). This patch fix the issue in the module magnum/tests/unit/common/. Change-Id: Ib92006145171d265b836e0fc9951583414d83952 Partial-Bug: #1259292
This commit is contained in:
parent
bc0c1a4644
commit
cb46cfafa8
|
@ -67,11 +67,11 @@ class TestBarbicanCert(base.BaseTestCase):
|
|||
)
|
||||
|
||||
# Validate the cert functions
|
||||
self.assertEqual(cert.get_certificate(), self.certificate)
|
||||
self.assertEqual(cert.get_intermediates(), self.intermediates)
|
||||
self.assertEqual(cert.get_private_key(), self.private_key)
|
||||
self.assertEqual(cert.get_private_key_passphrase(),
|
||||
self.private_key_passphrase)
|
||||
self.assertEqual(self.certificate, cert.get_certificate())
|
||||
self.assertEqual(self.intermediates, cert.get_intermediates())
|
||||
self.assertEqual(self.private_key, cert.get_private_key())
|
||||
self.assertEqual(self.private_key_passphrase,
|
||||
cert.get_private_key_passphrase())
|
||||
|
||||
def test_barbican_cert_none_values(self):
|
||||
container = barbican_client.containers.CertificateContainer(
|
||||
|
@ -87,10 +87,10 @@ class TestBarbicanCert(base.BaseTestCase):
|
|||
)
|
||||
|
||||
# Validate the cert functions
|
||||
self.assertEqual(cert.get_certificate(), None)
|
||||
self.assertEqual(cert.get_intermediates(), None)
|
||||
self.assertEqual(cert.get_private_key(), None)
|
||||
self.assertEqual(cert.get_private_key_passphrase(), None)
|
||||
self.assertIsNone(cert.get_certificate())
|
||||
self.assertIsNone(cert.get_intermediates())
|
||||
self.assertIsNone(cert.get_private_key())
|
||||
self.assertIsNone(cert.get_private_key_passphrase())
|
||||
|
||||
|
||||
class TestBarbicanManager(base.BaseTestCase):
|
||||
|
@ -158,7 +158,7 @@ class TestBarbicanManager(base.BaseTestCase):
|
|||
bc.secrets.create.assert_has_calls(calls, any_order=True)
|
||||
|
||||
# create_certificate should be called once
|
||||
self.assertEqual(bc.containers.create_certificate.call_count, 1)
|
||||
self.assertEqual(1, bc.containers.create_certificate.call_count)
|
||||
|
||||
# Container should be stored once
|
||||
self.empty_container.store.assert_called_once_with()
|
||||
|
@ -203,7 +203,7 @@ class TestBarbicanManager(base.BaseTestCase):
|
|||
bc.secrets.create.assert_has_calls(calls, any_order=True)
|
||||
|
||||
# create_certificate should be called once
|
||||
self.assertEqual(bc.containers.create_certificate.call_count, 1)
|
||||
self.assertEqual(1, bc.containers.create_certificate.call_count)
|
||||
|
||||
# Container should be stored once
|
||||
self.empty_container.store.assert_called_once_with()
|
||||
|
@ -235,14 +235,14 @@ class TestBarbicanManager(base.BaseTestCase):
|
|||
|
||||
# The returned data should be a Cert object with the correct values
|
||||
self.assertIsInstance(data, cert_manager.Cert)
|
||||
self.assertEqual(data.get_private_key(),
|
||||
self.private_key.payload)
|
||||
self.assertEqual(data.get_certificate(),
|
||||
self.certificate.payload)
|
||||
self.assertEqual(data.get_intermediates(),
|
||||
self.intermediates.payload)
|
||||
self.assertEqual(data.get_private_key_passphrase(),
|
||||
self.private_key_passphrase.payload)
|
||||
self.assertEqual(self.private_key.payload,
|
||||
data.get_private_key())
|
||||
self.assertEqual(self.certificate.payload,
|
||||
data.get_certificate())
|
||||
self.assertEqual(self.intermediates.payload,
|
||||
data.get_intermediates())
|
||||
self.assertEqual(self.private_key_passphrase.payload,
|
||||
data.get_private_key_passphrase())
|
||||
|
||||
@patch('magnum.common.clients.OpenStackClients.barbican')
|
||||
def test_get_cert_no_registration(self, mock_barbican):
|
||||
|
@ -263,14 +263,14 @@ class TestBarbicanManager(base.BaseTestCase):
|
|||
|
||||
# The returned data should be a Cert object with the correct values
|
||||
self.assertIsInstance(data, cert_manager.Cert)
|
||||
self.assertEqual(data.get_private_key(),
|
||||
self.private_key.payload)
|
||||
self.assertEqual(data.get_certificate(),
|
||||
self.certificate.payload)
|
||||
self.assertEqual(data.get_intermediates(),
|
||||
self.intermediates.payload)
|
||||
self.assertEqual(data.get_private_key_passphrase(),
|
||||
self.private_key_passphrase.payload)
|
||||
self.assertEqual(self.private_key.payload,
|
||||
data.get_private_key())
|
||||
self.assertEqual(self.certificate.payload,
|
||||
data.get_certificate())
|
||||
self.assertEqual(self.intermediates.payload,
|
||||
data.get_intermediates())
|
||||
self.assertEqual(self.private_key_passphrase.payload,
|
||||
data.get_private_key_passphrase())
|
||||
|
||||
@patch('magnum.common.clients.OpenStackClients.barbican')
|
||||
def test_delete_cert(self, mock_barbican):
|
||||
|
|
|
@ -43,7 +43,7 @@ class TestCert(base.BaseTestCase):
|
|||
mock_x509_ops.decrypt_key.return_value = 'fake-key'
|
||||
fake_cert = FakeCert()
|
||||
decrypted_key = fake_cert.get_decrypted_private_key()
|
||||
self.assertEqual(decrypted_key, 'fake-key')
|
||||
self.assertEqual('fake-key', decrypted_key)
|
||||
mock_x509_ops.decrypt_key.assert_called_once_with('fake-private-key',
|
||||
'fake-passphrase')
|
||||
|
||||
|
|
|
@ -43,11 +43,11 @@ class TestLocalCert(base.BaseTestCase):
|
|||
)
|
||||
|
||||
# Validate the cert functions
|
||||
self.assertEqual(cert.get_certificate(), self.certificate)
|
||||
self.assertEqual(cert.get_intermediates(), self.intermediates)
|
||||
self.assertEqual(cert.get_private_key(), self.private_key)
|
||||
self.assertEqual(cert.get_private_key_passphrase(),
|
||||
self.private_key_passphrase)
|
||||
self.assertEqual(self.certificate, cert.get_certificate())
|
||||
self.assertEqual(self.intermediates, cert.get_intermediates())
|
||||
self.assertEqual(self.private_key, cert.get_private_key())
|
||||
self.assertEqual(self.private_key_passphrase,
|
||||
cert.get_private_key_passphrase())
|
||||
|
||||
|
||||
class TestLocalManager(base.BaseTestCase):
|
||||
|
|
|
@ -81,4 +81,4 @@ class ContextTestCase(base.TestCase):
|
|||
|
||||
def test_request_context_sets_is_admin(self):
|
||||
ctxt = magnum_context.make_admin_context()
|
||||
self.assertEqual(ctxt.is_admin, True)
|
||||
self.assertEqual(True, ctxt.is_admin)
|
||||
|
|
|
@ -50,7 +50,7 @@ class TestDockerUtils(base.BaseTestCase):
|
|||
|
||||
with docker_utils.docker_for_container(mock.sentinel.context,
|
||||
mock_container) as docker:
|
||||
self.assertEqual(docker, mock_docker)
|
||||
self.assertEqual(mock_docker, docker)
|
||||
|
||||
mock_get_bay_by_uuid.assert_called_once_with(mock.sentinel.context,
|
||||
mock_container.bay_uuid)
|
||||
|
@ -95,7 +95,7 @@ class TestDockerUtils(base.BaseTestCase):
|
|||
|
||||
with docker_utils.docker_for_container(
|
||||
mock.sentinel.context, mock_container.uuid) as docker:
|
||||
self.assertEqual(docker, mock_docker)
|
||||
self.assertEqual(mock_docker, docker)
|
||||
|
||||
mock_get_container_by_uuid.assert_called_once_with(
|
||||
mock.sentinel.context, mock_container.uuid
|
||||
|
@ -130,7 +130,7 @@ class TestDockerUtils(base.BaseTestCase):
|
|||
|
||||
with docker_utils.docker_for_container(mock.sentinel.context,
|
||||
mock_container) as docker:
|
||||
self.assertEqual(docker, mock_docker)
|
||||
self.assertEqual(mock_docker, docker)
|
||||
|
||||
mock_get_bay_by_uuid.assert_called_once_with(mock.sentinel.context,
|
||||
mock_container.bay_uuid)
|
||||
|
|
|
@ -61,11 +61,11 @@ class TestException(base.BaseTestCase):
|
|||
|
||||
def test_message_is_templated(self):
|
||||
ex = TestMagnumException(name="NAME")
|
||||
self.assertEqual(ex.message, "templated NAME")
|
||||
self.assertEqual("templated NAME", ex.message)
|
||||
|
||||
def test_custom_message_is_templated(self):
|
||||
ex = TestMagnumException(_("custom templated %(name)s"), name="NAME")
|
||||
self.assertEqual(ex.message, "custom templated NAME")
|
||||
self.assertEqual("custom templated NAME", ex.message)
|
||||
|
||||
def test_all_exceptions(self):
|
||||
for name, obj in inspect.getmembers(exception):
|
||||
|
|
|
@ -35,7 +35,7 @@ class TestUrlFetch(base.BaseTestCase):
|
|||
mock_response.iter_content.return_value = mock_reader
|
||||
mock_request_get.return_value = mock_response
|
||||
|
||||
self.assertEqual(urlfetch.get('http://example.com'), 'abc')
|
||||
self.assertEqual('abc', urlfetch.get('http://example.com'))
|
||||
|
||||
@patch('requests.get')
|
||||
def test_get_exceed_manifest_size(self,
|
||||
|
|
|
@ -21,14 +21,14 @@ class TestYamlUtils(base.BaseTestCase):
|
|||
|
||||
def test_load_yaml(self):
|
||||
yml_dict = yamlutils.load('a: x\nb: y\n')
|
||||
self.assertEqual(yml_dict, {'a': 'x', 'b': 'y'})
|
||||
self.assertEqual({'a': 'x', 'b': 'y'}, yml_dict)
|
||||
|
||||
def test_load_empty_yaml(self):
|
||||
self.assertRaises(ValueError, yamlutils.load, '{}')
|
||||
|
||||
def test_load_empty_list(self):
|
||||
yml_dict = yamlutils.load('[]')
|
||||
self.assertEqual(yml_dict, [])
|
||||
self.assertEqual([], yml_dict)
|
||||
|
||||
def test_load_invalid_yaml_syntax(self):
|
||||
self.assertRaises(ValueError, yamlutils.load, "}invalid: y'm'l3!")
|
||||
|
|
|
@ -44,4 +44,4 @@ class TestX509Operations(base.BaseTestCase):
|
|||
format=serialization.PrivateFormat.PKCS8,
|
||||
encryption_algorithm=mock_no_encryption_class.return_value
|
||||
)
|
||||
self.assertEqual(actual_decrypted, mock.sentinel.decrypted)
|
||||
self.assertEqual(mock.sentinel.decrypted, actual_decrypted)
|
||||
|
|
|
@ -40,7 +40,7 @@ class TestValidators(unittest.TestCase):
|
|||
|
||||
actual = [e for e in v.filter_allowed_extensions([key_usage],
|
||||
['keyUsage'])]
|
||||
self.assertEqual(actual, [key_usage])
|
||||
self.assertEqual([key_usage], actual)
|
||||
|
||||
def test_filter_allowed_extensions_disallowed_but_not_critical(self):
|
||||
key_usage = self._build_key_usage()
|
||||
|
@ -48,7 +48,7 @@ class TestValidators(unittest.TestCase):
|
|||
actual = [e for e in v.filter_allowed_extensions([key_usage],
|
||||
['subjectAltName'])]
|
||||
|
||||
self.assertEqual(actual, [])
|
||||
self.assertEqual([], actual)
|
||||
|
||||
def test_filter_allowed_extensions_disallowed(self):
|
||||
key_usage = self._build_key_usage(critical=True)
|
||||
|
@ -59,8 +59,10 @@ class TestValidators(unittest.TestCase):
|
|||
def test_merge_key_usage(self):
|
||||
key_usage = self._build_key_usage(critical=True)
|
||||
|
||||
self.assertEqual(v._merge_key_usage(
|
||||
key_usage, ['Digital Signature', 'Key Encipherment']), key_usage)
|
||||
self.assertEqual(key_usage,
|
||||
v._merge_key_usage(key_usage,
|
||||
['Digital Signature',
|
||||
'Key Encipherment']))
|
||||
|
||||
def test_merge_key_usage_disallowed_but_not_critical(self):
|
||||
key_usage = self._build_key_usage()
|
||||
|
@ -68,8 +70,9 @@ class TestValidators(unittest.TestCase):
|
|||
True, False, False, False, False, False, False, False, False)
|
||||
expected = c_x509.Extension(expected.oid, False, expected)
|
||||
|
||||
self.assertEqual(v._merge_key_usage(
|
||||
key_usage, ['Digital Signature']), expected)
|
||||
self.assertEqual(expected,
|
||||
v._merge_key_usage(key_usage,
|
||||
['Digital Signature']))
|
||||
|
||||
def test_merge_key_usage_disallowed(self):
|
||||
key_usage = self._build_key_usage(critical=True)
|
||||
|
@ -81,7 +84,7 @@ class TestValidators(unittest.TestCase):
|
|||
bc = self._build_basic_constraints(ca=True)
|
||||
expected = self._build_basic_constraints(ca=False)
|
||||
|
||||
self.assertEqual(v._disallow_ca_in_basic_constraints(bc), expected)
|
||||
self.assertEqual(expected, v._disallow_ca_in_basic_constraints(bc))
|
||||
|
||||
def test_disallow_ca_in_basic_constraints(self):
|
||||
bc = self._build_basic_constraints(ca=True, critical=True)
|
||||
|
@ -92,29 +95,29 @@ class TestValidators(unittest.TestCase):
|
|||
def test_disallow_ca_in_basic_constraints_with_non_ca(self):
|
||||
bc = self._build_basic_constraints(ca=False)
|
||||
|
||||
self.assertEqual(v._disallow_ca_in_basic_constraints(bc), bc)
|
||||
self.assertEqual(bc, v._disallow_ca_in_basic_constraints(bc))
|
||||
|
||||
def test_remove_ca_key_usage(self):
|
||||
contains_ca_key_usage = set([
|
||||
"Digital Signature", "Certificate Sign", "CRL Sign"])
|
||||
|
||||
self.assertEqual(v._remove_ca_key_usage(contains_ca_key_usage),
|
||||
set(["Digital Signature"]))
|
||||
self.assertEqual(set(["Digital Signature"]),
|
||||
v._remove_ca_key_usage(contains_ca_key_usage))
|
||||
|
||||
def test_remove_ca_key_usage_cert_sign(self):
|
||||
contains_ca_key_usage = set(["Digital Signature", "Certificate Sign"])
|
||||
|
||||
self.assertEqual(v._remove_ca_key_usage(contains_ca_key_usage),
|
||||
set(["Digital Signature"]))
|
||||
self.assertEqual(set(["Digital Signature"]),
|
||||
v._remove_ca_key_usage(contains_ca_key_usage))
|
||||
|
||||
def test_remove_ca_key_usage_crl_sign(self):
|
||||
contains_ca_key_usage = set(["Digital Signature", "CRL Sign"])
|
||||
|
||||
self.assertEqual(v._remove_ca_key_usage(contains_ca_key_usage),
|
||||
set(["Digital Signature"]))
|
||||
self.assertEqual(set(["Digital Signature"]),
|
||||
v._remove_ca_key_usage(contains_ca_key_usage))
|
||||
|
||||
def test_remove_ca_key_usage_without_ca_usage(self):
|
||||
contains_ca_key_usage = set(["Digital Signature"])
|
||||
|
||||
self.assertEqual(v._remove_ca_key_usage(contains_ca_key_usage),
|
||||
set(["Digital Signature"]))
|
||||
self.assertEqual(set(["Digital Signature"]),
|
||||
v._remove_ca_key_usage(contains_ca_key_usage))
|
||||
|
|
Loading…
Reference in New Issue