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

tests: fix (system) network tests after switching to ipaddress module

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-12-23 15:35:46 +01:00
parent 3668a73ca2
commit 3fa0972317
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qubes/tests/integ/network.py
View File

@ -379,7 +379,7 @@ class VmNetworkingMixin(object):
output = output.decode() output = output.decode()
self.assertIn('192.168.1.128', output) self.assertIn('192.168.1.128', output)
self.assertNotIn(self.testvm1.ip, output) self.assertNotIn(str(self.testvm1.ip), output)
try: try:
(output, _) = self.loop.run_until_complete( (output, _) = self.loop.run_until_complete(
@ -389,7 +389,7 @@ class VmNetworkingMixin(object):
output = output.decode() output = output.decode()
self.assertIn('192.168.1.1', output) self.assertIn('192.168.1.1', output)
self.assertNotIn(self.testvm1.netvm.ip, output) self.assertNotIn(str(self.testvm1.netvm.ip), output)
def test_201_fake_ip_without_gw(self): def test_201_fake_ip_without_gw(self):
'''Test hiding VM real IP''' '''Test hiding VM real IP'''
@ -408,7 +408,7 @@ class VmNetworkingMixin(object):
output = output.decode() output = output.decode()
self.assertIn('192.168.1.128', output) self.assertIn('192.168.1.128', output)
self.assertNotIn(self.testvm1.ip, output) self.assertNotIn(str(self.testvm1.ip), output)
def test_202_fake_ip_firewall(self): def test_202_fake_ip_firewall(self):
'''Test hiding VM real IP, firewall''' '''Test hiding VM real IP, firewall'''
@ -546,7 +546,7 @@ class VmNetworkingMixin(object):
self.fail('ip addr show dev eth0 failed') self.fail('ip addr show dev eth0 failed')
output = output.decode() output = output.decode()
self.assertIn('192.168.1.128', output) self.assertIn('192.168.1.128', output)
self.assertNotIn(self.testvm1.ip, output) self.assertNotIn(str(self.testvm1.ip), output)
try: try:
(output, _) = self.loop.run_until_complete( (output, _) = self.loop.run_until_complete(
@ -556,7 +556,7 @@ class VmNetworkingMixin(object):
self.fail('ip route show failed') self.fail('ip route show failed')
output = output.decode() output = output.decode()
self.assertIn('192.168.1.1', output) self.assertIn('192.168.1.1', output)
self.assertNotIn(self.testvm1.netvm.ip, output) self.assertNotIn(str(self.testvm1.netvm.ip), output)
try: try:
(output, _) = self.loop.run_until_complete( (output, _) = self.loop.run_until_complete(
@ -566,7 +566,7 @@ class VmNetworkingMixin(object):
self.fail('ip addr show dev eth0 failed') self.fail('ip addr show dev eth0 failed')
output = output.decode() output = output.decode()
self.assertNotIn('192.168.1.128', output) self.assertNotIn('192.168.1.128', output)
self.assertIn(self.testvm1.ip, output) self.assertIn(str(self.testvm1.ip), output)
try: try:
(output, _) = self.loop.run_until_complete( (output, _) = self.loop.run_until_complete(
@ -576,7 +576,7 @@ class VmNetworkingMixin(object):
self.fail('ip route show failed') self.fail('ip route show failed')
output = output.decode() output = output.decode()
self.assertIn('192.168.1.128', output) self.assertIn('192.168.1.128', output)
self.assertNotIn(self.proxy.ip, output) self.assertNotIn(str(self.proxy.ip), output)
def test_210_custom_ip_simple(self): def test_210_custom_ip_simple(self):
'''Custom AppVM IP''' '''Custom AppVM IP'''
@ -932,8 +932,8 @@ class VmIPv6NetworkingMixin(VmNetworkingMixin):
'ip -6 addr flush dev eth0 && ' 'ip -6 addr flush dev eth0 && '
'ip -6 addr add {}/128 dev eth0 && ' 'ip -6 addr add {}/128 dev eth0 && '
'ip -6 route add default via {} dev eth0'.format( 'ip -6 route add default via {} dev eth0'.format(
self.testvm1.visible_ip6 + '1', str(self.testvm1.visible_ip6) + '1',
self.testvm1.visible_gateway6), str(self.testvm1.visible_gateway6)),
user='root')) user='root'))
self.assertNotEqual(self.run_cmd(self.testvm1, self.ping6_ip), 0, self.assertNotEqual(self.run_cmd(self.testvm1, self.ping6_ip), 0,
"Spoofed ping should be blocked") "Spoofed ping should be blocked")