Merge "Bump hacking in test-requirements.txt"

This commit is contained in:
Jenkins 2016-04-11 04:38:38 +00:00 committed by Gerrit Code Review
commit 02d87760ee
5 changed files with 16 additions and 15 deletions

View File

@ -40,6 +40,7 @@ class NetConfig(object):
def add_object(self, obj): def add_object(self, obj):
"""Convenience method to add any type of object to the network config. """Convenience method to add any type of object to the network config.
See objects.py. See objects.py.
:param obj: The object to add. :param obj: The object to add.

View File

@ -85,8 +85,8 @@ class TestInterface(base.TestCase):
v4_addr = objects.Address('192.168.1.1/24') v4_addr = objects.Address('192.168.1.1/24')
v6_addr = objects.Address('2001:abc:a::/64') v6_addr = objects.Address('2001:abc:a::/64')
interface = objects.Interface('foo', addresses=[v4_addr, v6_addr]) interface = objects.Interface('foo', addresses=[v4_addr, v6_addr])
self.assertEquals("192.168.1.1", interface.v4_addresses()[0].ip) self.assertEqual("192.168.1.1", interface.v4_addresses()[0].ip)
self.assertEquals("2001:abc:a::", interface.v6_addresses()[0].ip) self.assertEqual("2001:abc:a::", interface.v6_addresses()[0].ip)
def test_from_json_dhcp(self): def test_from_json_dhcp(self):
data = '{"type": "interface", "name": "em1", "use_dhcp": true}' data = '{"type": "interface", "name": "em1", "use_dhcp": true}'

View File

@ -1,4 +1,4 @@
hacking>=0.5.6,<0.8 hacking>=0.10.2,<0.11 # Apache-2.0
coverage>=3.6 coverage>=3.6
discover discover