aboutsummaryrefslogtreecommitdiffstats
path: root/os_net_config/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-04-11 04:38:38 +0000
committerGerrit Code Review <review@openstack.org>2016-04-11 04:38:38 +0000
commit02d87760ee03699838911837945c3886dae47b83 (patch)
tree077a978e995d75ebe742786db8ef0b0200c02caf /os_net_config/tests
parent2188cf1651648af1900b7bb070f9b1eb3f982c3b (diff)
parent876107d89f9015abe13221a9417d1e309e569768 (diff)
Merge "Bump hacking in test-requirements.txt"
Diffstat (limited to 'os_net_config/tests')
-rw-r--r--os_net_config/tests/test_impl_ifcfg.py4
-rw-r--r--os_net_config/tests/test_objects.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/os_net_config/tests/test_impl_ifcfg.py b/os_net_config/tests/test_impl_ifcfg.py
index e81e049..d68a96e 100644
--- a/os_net_config/tests/test_impl_ifcfg.py
+++ b/os_net_config/tests/test_impl_ifcfg.py
@@ -673,7 +673,7 @@ class TestIfcfgNetConfigApply(base.TestCase):
self.assertEqual([], self.ifup_interface_names)
def test_bond_active_slave(self):
- #setup and apply a bond
+ # setup and apply a bond
interface1 = objects.Interface('em1')
interface2 = objects.Interface('em2', primary=True)
bond = objects.OvsBond('bond1', use_dhcp=True,
@@ -686,7 +686,7 @@ class TestIfcfgNetConfigApply(base.TestCase):
self.assertIn(ovs_appctl_cmds, self.ovs_appctl_cmds)
def test_bond_active_ordering(self):
- #setup and apply a bond
+ # setup and apply a bond
interface1 = objects.Interface('em1')
interface2 = objects.Interface('em2')
bond = objects.OvsBond('bond1', use_dhcp=True,
diff --git a/os_net_config/tests/test_objects.py b/os_net_config/tests/test_objects.py
index b49c393..d3e41df 100644
--- a/os_net_config/tests/test_objects.py
+++ b/os_net_config/tests/test_objects.py
@@ -85,8 +85,8 @@ class TestInterface(base.TestCase):
v4_addr = objects.Address('192.168.1.1/24')
v6_addr = objects.Address('2001:abc:a::/64')
interface = objects.Interface('foo', addresses=[v4_addr, v6_addr])
- self.assertEquals("192.168.1.1", interface.v4_addresses()[0].ip)
- self.assertEquals("2001:abc:a::", interface.v6_addresses()[0].ip)
+ self.assertEqual("192.168.1.1", interface.v4_addresses()[0].ip)
+ self.assertEqual("2001:abc:a::", interface.v6_addresses()[0].ip)
def test_from_json_dhcp(self):
data = '{"type": "interface", "name": "em1", "use_dhcp": true}'