Change in vdsm[master]: network: tests: mirror drop inital ip tests

phoracek at redhat.com phoracek at redhat.com
Fri Dec 18 10:59:00 UTC 2015


Petr Horáček has uploaded a new change for review.

Change subject: network: tests: mirror drop inital ip tests
......................................................................

network: tests: mirror drop inital ip tests

Rename test_remove_initial_network_nic_ip_config to
test_drop_initial_network_nic_ip_config, to be uniform with
test_drop_initial_network_bond_ip_config.

Use self.assertNotIn(IPv6_ADDRESS_AND_CIDR, ipv6addrs)
instead of self.assertEqual([], ipv6addrs), it will prevent
possible errors caused by IPv6 link-local address assigned
by default, also it is what we assign in
test_drop_initial_network_nic_ip_config.

Change-Id: I042b45de389c5a0faca5f913eac9691ae3d6069b
Signed-off-by: Petr Horáček <phoracek at redhat.com>
---
M tests/functional/networkTests.py
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/50713/1

diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 2c22fe8..30a62f3 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -2689,7 +2689,7 @@
 
     @cleanupNet
     @ValidateRunningAsRoot
-    def test_remove_initial_network_nic_ip_config(self):
+    def test_drop_initial_network_nic_ip_config(self):
         with dummyIf(1) as nics:
             nic, = nics
             addrAdd(nic, IP_ADDRESS, IP_CIDR)
@@ -2725,8 +2725,8 @@
 
                 ipv4addrs = self.vdsm_net.netinfo.nics[nic_1]['ipv4addrs']
                 ipv6addrs = self.vdsm_net.netinfo.nics[nic_1]['ipv6addrs']
-                self.assertEqual([], ipv4addrs)
-                self.assertEqual([], ipv6addrs)
+                self.assertNotIn(IP_ADDRESS_AND_CIDR, ipv4addrs)
+                self.assertNotIn(IPv6_ADDRESS_AND_CIDR, ipv6addrs)
 
                 status, msg = self.vdsm_net.setupNetworks(
                     {}, {BONDING_NAME: {'remove': True}}, NOCHK)


-- 
To view, visit https://gerrit.ovirt.org/50713
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I042b45de389c5a0faca5f913eac9691ae3d6069b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek at redhat.com>


More information about the vdsm-patches mailing list