Fixed order of arguments in assertEqual

Some tests used incorrect order of arguments in
assertEqual(observed, expected). The correct order expected
by testtool is assertEqual(expected, observed).

Change-Id: I9ef01d5aef1610830a4d89ecea3c5b128c9fa6ed
This commit is contained in:
sudhir_agarwal 2017-07-06 18:19:32 +05:30
parent 4923182db3
commit 70942f44ea
5 changed files with 27 additions and 27 deletions

View File

@ -45,8 +45,8 @@ class TestNetworkControllerNeutron(base.TestController):
m_index.return_value = ooi_net
result = self.controller.index(req)
expected = self.controller._get_network_resources(ooi_net)
self.assertEqual(result.resources.__len__(),
expected.__len__())
self.assertEqual(expected.__len__(),
result.resources.__len__())
m_index.assert_called_with(req, 'networks')
@mock.patch.object(helpers_neutron.OpenStackNeutron, "get_network_details")
@ -116,8 +116,8 @@ class TestNetworkControllerNeutron(base.TestController):
test_networks = fakes.networks[fakes.tenants["foo"]["id"]]
for net in test_networks:
ret = self.controller.delete(None, net["id"])
self.assertEqual(ret, [])
self.assertEqual(ret.__len__(), 0)
self.assertEqual([], ret)
self.assertEqual(0, ret.__len__())
def test_get_network_resources(self):
test_networks = fakes.networks[fakes.tenants["foo"]["id"]]
@ -201,8 +201,8 @@ class TestNetworkControllerNova(base.TestController):
m_index.return_value = ooi_net
result = self.controller.index(req)
expected = self.controller._get_network_resources(ooi_net)
self.assertEqual(result.resources.__len__(),
expected.__len__())
self.assertEqual(expected.__len__(),
result.resources.__len__())
m_index.assert_called_with(req)
@mock.patch.object(helpers.OpenStackHelper, "get_network_details")
@ -272,8 +272,8 @@ class TestNetworkControllerNova(base.TestController):
test_networks = fakes.networks[fakes.tenants["foo"]["id"]]
for net in test_networks:
ret = self.controller.delete(None, net["id"])
self.assertEqual(ret, [])
self.assertEqual(ret.__len__(), 0)
self.assertEqual([], ret)
self.assertEqual(0, ret.__len__())
def test_get_network_resources(self):
test_networks = fakes.networks[fakes.tenants["foo"]["id"]]

View File

@ -67,7 +67,7 @@ class TestNetworkLinkController(base.TestController):
mock_list.return_value = links
ret = self.controller.index(req)
self.assertIsInstance(ret, collection.Collection)
self.assertEqual(ret.resources.__len__(), 0)
self.assertEqual(0, ret.resources.__len__())
@mock.patch.object(helpers.OpenStackHelper,
"delete_port")
@ -225,7 +225,7 @@ class TestNetworkLinkController(base.TestController):
def test_get_network_link_resources_empty(self):
ret = network_link_api._get_network_link_resources(None)
self.assertEqual(ret.__len__(), 0)
self.assertEqual(0, ret.__len__())
@mock.patch.object(helpers.OpenStackHelper,
"assign_floating_ip_deprecated")

View File

@ -41,8 +41,8 @@ class TestSecurityGroupControllerNeutron(base.TestController):
m_list.return_value = sec_group
result = self.controller.index(req)
expected = self.controller._get_security_group_resources(sec_group)
self.assertEqual(result.resources.__len__(),
expected.__len__())
self.assertEqual(expected.__len__(),
result.resources.__len__())
for r in result.resources:
self.assertIsInstance(r, occi_security_group.SecurityGroupResource)
m_list.assert_called_with(req)
@ -57,7 +57,7 @@ class TestSecurityGroupControllerNeutron(base.TestController):
req = fakes.create_req_test(None, None)
m_list.return_value = sec_group
result = self.controller.index(req)
self.assertEqual(result.resources.__len__(), 0)
self.assertEqual(0, result.resources.__len__())
@mock.patch.object(helpers_neutron.OpenStackNeutron,
"get_security_group_details")
@ -73,7 +73,7 @@ class TestSecurityGroupControllerNeutron(base.TestController):
self.assertIsInstance(
result,
occi_security_group.SecurityGroupResource)
self.assertEqual(result, expected)
self.assertEqual(expected, result)
m_list.assert_called_with(req, None)
@mock.patch.object(helpers_neutron.OpenStackNeutron, "get_resource")

View File

@ -48,7 +48,7 @@ class TestOCCICompute(base.TestCase):
self.assertIn("occi.compute.state", c.attributes)
self.assertIn("occi.compute.state.message", c.attributes)
self.assertEqual(resource.Resource.kind, c.kind.parent)
self.assertEqual(c.kind.location, "compute/")
self.assertEqual("compute/", c.kind.location)
# TODO(aloga): We need to check that the attributes are actually set
# after we get an object (we have to check this for this but also for
# the other resources)
@ -113,7 +113,7 @@ class TestOCCIStorage(base.TestCase):
self.assertIn("occi.storage.state", s.attributes)
self.assertIn("occi.storage.state.message", s.attributes)
self.assertEqual(resource.Resource.kind, s.kind.parent)
self.assertEqual(s.kind.location, "storage/")
self.assertEqual("storage/", s.kind.location)
# TODO(aloga): We need to check that the attributes are actually set
# after we get an object (we have to check this for this but also for
# the other resources)
@ -155,7 +155,7 @@ class TestOCCIStorageLink(base.TestCase):
self.assertIn("occi.storagelink.state", s.attributes)
self.assertIn("occi.storagelink.state.message", s.attributes)
self.assertEqual(link.Link.kind, s.kind.parent)
self.assertEqual(s.kind.location, "storagelink/")
self.assertEqual("storagelink/", s.kind.location)
def test_storagelink(self):
server_id = uuid.uuid4().hex
@ -232,7 +232,7 @@ class TestOCCINetwork(base.TestCase):
self.assertIn("occi.network.state", n.attributes)
self.assertIn("occi.network.state.message", n.attributes)
self.assertEqual(resource.Resource.kind, n.kind.parent)
self.assertEqual(n.kind.location, "network/")
self.assertEqual("network/", n.kind.location)
# TODO(aloga): We need to check that the attributes are actually set
# after we get an object (we have to check this for this but also for
# the other resources)
@ -301,7 +301,7 @@ class TestOCCINetworkInterface(base.TestCase):
self.assertIn("occi.networkinterface.state", l.attributes)
self.assertIn("occi.networkinterface.state.message", l.attributes)
self.assertEqual(link.Link.kind, l.kind.parent)
self.assertEqual(l.kind.location, "networklink/")
self.assertEqual("networklink/", l.kind.location)
def test_networkinterface(self):
c = compute.ComputeResource("foo",
@ -374,7 +374,7 @@ class TestOCCISecurityGRoup(base.TestCase):
self.assertIn("occi.securitygroup.rules", s.attributes)
self.assertIn("occi.securitygroup.state", s.attributes)
self.assertEqual(resource.Resource.kind, s.kind.parent)
self.assertEqual(s.kind.location, "securitygroup/")
self.assertEqual("securitygroup/", s.kind.location)
def test_securitygroup(self):
id = uuid.uuid4().hex
@ -415,7 +415,7 @@ class TestOCCISecurityGroupLink(base.TestCase):
self.assertIn("occi.core.target", s.attributes)
self.assertIn("occi.securitygrouplink.state", s.attributes)
self.assertEqual(link.Link.kind, s.kind.parent)
self.assertEqual(s.kind.location, "securitygrouplink/")
self.assertEqual("securitygrouplink/", s.kind.location)
def test_securitygrouplink(self):
server_id = uuid.uuid4().hex
@ -451,7 +451,7 @@ class TestOCCIIPReservation(base.TestCase):
self.assertIn("occi.ipreservation.used", ir.attributes)
self.assertIn("occi.ipreservation.state", ir.attributes)
self.assertEqual(network.NetworkResource.kind, ir.kind.parent)
self.assertEqual(ir.kind.location, "ipreservation/")
self.assertEqual("ipreservation/", ir.kind.location)
def test_ip_reservation(self):
id = uuid.uuid4().hex

View File

@ -119,10 +119,10 @@ class TestOSNetworkInterface(base.TestCase):
i = os_network.OSNetworkInterface(c, n, "00:01:02:03:04:05",
"127.0.0.1", pool="foo")
self.assertEqual('_'.join([c.id, "127.0.0.1"]), i.id)
self.assertEqual(i.address, "127.0.0.1")
self.assertEqual(i.interface, "eth0")
self.assertEqual(i.mac, "00:01:02:03:04:05")
self.assertEqual(i.state, "active")
self.assertEqual("127.0.0.1", i.address)
self.assertEqual("eth0", i.interface)
self.assertEqual("00:01:02:03:04:05", i.mac)
self.assertEqual("active", i.state)
self.assertIsNone(i.gateway)
self.assertEqual(network_link.NetworkInterface.kind, i.kind)
self.assertEqual(2, len(i.mixins))
@ -132,7 +132,7 @@ class TestOSNetworkInterface(base.TestCase):
has_pool = False
for m in i.mixins:
if isinstance(m, os_network.OSFloatingIPPool):
self.assertEqual(m.term, "foo")
self.assertEqual("foo", m.term)
has_pool = True
break
self.assertTrue(has_pool)