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

tests: fix various object leaks cont

Browse Source 
Do not use self.fail when handling exception - this will keep exception
object referenced, which in turn have reference to domain object (via
traceback).
This commit is contained in:
Marek Marczykowski-Górecki 2017-09-29 03:39:22 +02:00
parent f9da1f2dd7
commit 9172a7708d
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,14 +481,16 @@ class VmNetworkingMixin(object):
self.loop.run_until_complete(self.proxy.run_for_stdio( self.loop.run_until_complete(self.proxy.run_for_stdio(
cmd, user='root')) cmd, user='root'))
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
self.fail('{} failed with: {}'.format(cmd, e.returncode)) raise AssertionError(
'{} failed with: {}'.format(cmd, e.returncode)) from None
try: try:
cmd = 'iptables -I INPUT -s {} -j ACCEPT'.format(self.testvm2.ip) cmd = 'iptables -I INPUT -s {} -j ACCEPT'.format(self.testvm2.ip)
self.loop.run_until_complete(self.proxy.run_for_stdio( self.loop.run_until_complete(self.proxy.run_for_stdio(
cmd, user='root')) cmd, user='root'))
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
self.fail('{} failed with: {}'.format(cmd, e.returncode)) raise AssertionError(
'{} failed with: {}'.format(cmd, e.returncode)) from None
self.assertEqual(self.run_cmd(self.testvm2, self.assertEqual(self.run_cmd(self.testvm2,
self.ping_cmd.format(target=self.testvm1.ip)), 0) self.ping_cmd.format(target=self.testvm1.ip)), 0)
@ -498,8 +500,8 @@ class VmNetworkingMixin(object):
(stdout, _) = self.loop.run_until_complete( (stdout, _) = self.loop.run_until_complete(
self.testvm1.run_for_stdio(cmd, user='root')) self.testvm1.run_for_stdio(cmd, user='root'))
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
self.fail( raise AssertionError(
'{} failed with {}'.format(cmd, e.returncode)) '{} failed with {}'.format(cmd, e.returncode)) from None
self.assertNotEqual(stdout.decode().split()[0], '0', self.assertNotEqual(stdout.decode().split()[0], '0',
'Packets didn\'t managed to the VM') 'Packets didn\'t managed to the VM')