Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: fix checking of ping return code

Browse Source 
Switch ==1 to !=0 - ping can exit with different errors (timeout,
resolve failed etc), but we don't care what was the reason.
This commit is contained in:
Marek Marczykowski-Górecki 2015-02-02 04:50:37 +01:00
parent 26a9dcda66
commit 17a92dd179
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/network.py
View File

@ -161,7 +161,7 @@ class VmNetworkingTests(unittest.TestCase):
user="user"), user="user"),
0, "Failed to disconnect eth0 using nmcli") 0, "Failed to disconnect eth0 using nmcli")
self.assertEqual(self.run_cmd(self.testvm1, self.ping_ip), 1, self.assertNotEqual(self.run_cmd(self.testvm1, self.ping_ip), 0,
"Network should be disabled, but apparently it isn't") "Network should be disabled, but apparently it isn't")
self.assertEqual( self.assertEqual(
self.run_cmd(self.proxy, "nmcli connection up \"VM uplink eth0\" " self.run_cmd(self.proxy, "nmcli connection up \"VM uplink eth0\" "
@ -208,10 +208,10 @@ class VmNetworkingTests(unittest.TestCase):
"Ping by IP from ProxyVM failed") "Ping by IP from ProxyVM failed")
self.assertEqual(self.run_cmd(self.proxy, self.ping_name), 0, self.assertEqual(self.run_cmd(self.proxy, self.ping_name), 0,
"Ping by name from ProxyVM failed") "Ping by name from ProxyVM failed")
self.assertEqual(self.run_cmd(self.testvm1, self.ping_ip), 1, self.assertNotEqual(self.run_cmd(self.testvm1, self.ping_ip), 0,
"Ping by IP should be blocked") "Ping by IP should be blocked")
nc_cmd = "nc -w 1 --recv-only 192.168.123.45 1234" nc_cmd = "nc -w 1 --recv-only 192.168.123.45 1234"
self.assertEqual(self.run_cmd(self.testvm1, nc_cmd), 1, self.assertNotEqual(self.run_cmd(self.testvm1, nc_cmd), 0,
"TCP connection should be blocked") "TCP connection should be blocked")
# block all except ICMP # block all except ICMP
@ -226,7 +226,7 @@ class VmNetworkingTests(unittest.TestCase):
time.sleep(1) time.sleep(1)
self.assertEqual(self.run_cmd(self.testvm1, self.ping_ip), 0, self.assertEqual(self.run_cmd(self.testvm1, self.ping_ip), 0,
"Ping by IP failed (should be allowed now)") "Ping by IP failed (should be allowed now)")
self.assertEqual(self.run_cmd(self.testvm1, self.ping_name), 2, self.assertNotEqual(self.run_cmd(self.testvm1, self.ping_name), 0,
"Ping by name should be blocked") "Ping by name should be blocked")
# all TCP still blocked # all TCP still blocked
@ -241,7 +241,7 @@ class VmNetworkingTests(unittest.TestCase):
time.sleep(1) time.sleep(1)
self.assertEqual(self.run_cmd(self.testvm1, self.ping_name), 0, self.assertEqual(self.run_cmd(self.testvm1, self.ping_name), 0,
"Ping by name failed (should be allowed now)") "Ping by name failed (should be allowed now)")
self.assertEqual(self.run_cmd(self.testvm1, nc_cmd), 1, self.assertNotEqual(self.run_cmd(self.testvm1, nc_cmd), 0,
"TCP connection should be blocked") "TCP connection should be blocked")
# block all except target # block all except target
@ -276,7 +276,7 @@ class VmNetworkingTests(unittest.TestCase):
self.proxy.write_iptables_xenstore_entry() self.proxy.write_iptables_xenstore_entry()
# Ugly hack b/c there is no feedback when the rules are actually applied # Ugly hack b/c there is no feedback when the rules are actually applied
time.sleep(1) time.sleep(1)
self.assertEqual(self.run_cmd(self.testvm1, nc_cmd), 1, self.assertNotEqual(self.run_cmd(self.testvm1, nc_cmd), 0,
"TCP connection should be blocked") "TCP connection should be blocked")
@ -301,19 +301,19 @@ class VmNetworkingTests(unittest.TestCase):
self.testvm1.start() self.testvm1.start()
self.testvm2.start() self.testvm2.start()
self.assertEqual(self.run_cmd(self.testvm1, self.assertNotEqual(self.run_cmd(self.testvm1,
"ping -W 1 -n -c 1 {}".format(self.testvm2.ip)), 1) "ping -W 1 -n -c 1 {}".format(self.testvm2.ip)), 0)
self.testvm2.netvm = self.testnetvm self.testvm2.netvm = self.testnetvm
self.assertEqual(self.run_cmd(self.testvm1, self.assertNotEqual(self.run_cmd(self.testvm1,
"ping -W 1 -n -c 1 {}".format(self.testvm2.ip)), 1) "ping -W 1 -n -c 1 {}".format(self.testvm2.ip)), 0)
self.assertEqual(self.run_cmd(self.testvm2, self.assertNotEqual(self.run_cmd(self.testvm2,
"ping -W 1 -n -c 1 {}".format(self.testvm1.ip)), 1) "ping -W 1 -n -c 1 {}".format(self.testvm1.ip)), 0)
self.testvm1.netvm = self.testnetvm self.testvm1.netvm = self.testnetvm
self.assertEqual(self.run_cmd(self.testvm1, self.assertNotEqual(self.run_cmd(self.testvm1,
"ping -W 1 -n -c 1 {}".format(self.testvm2.ip)), 1) "ping -W 1 -n -c 1 {}".format(self.testvm2.ip)), 0)
self.assertEqual(self.run_cmd(self.testvm2, self.assertNotEqual(self.run_cmd(self.testvm2,
"ping -W 1 -n -c 1 {}".format(self.testvm1.ip)), 1) "ping -W 1 -n -c 1 {}".format(self.testvm1.ip)), 0)