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

tests: fix cleanup in dom0 updates tests

Browse Source 
The only directory to cleanup is cls.tmpdir. So make it simple, without
class property cleanup_paths, which for some reason didn't wasn't
emptied in tearDownClass.
This commit is contained in:
Marek Marczykowski-Górecki 2015-11-03 02:40:53 +01:00
parent 5160423065
commit cf110c74e2
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/dom0_update.py
View File

@ -38,7 +38,6 @@ class TC_00_Dom0UpgradeMixin(qubes.tests.SystemTestsMixin):
""" """
Tests for downloading dom0 updates using VMs based on different templates Tests for downloading dom0 updates using VMs based on different templates
""" """
cleanup_paths = []
pkg_name = 'qubes-test-pkg' pkg_name = 'qubes-test-pkg'
dom0_update_common_opts = ['--disablerepo=*', '--enablerepo=test', dom0_update_common_opts = ['--disablerepo=*', '--enablerepo=test',
'--setopt=test.copy_local=1'] '--setopt=test.copy_local=1']
@ -76,7 +75,6 @@ Expire-Date: 0
super(TC_00_Dom0UpgradeMixin, cls).setUpClass() super(TC_00_Dom0UpgradeMixin, cls).setUpClass()
cls.tmpdir = tempfile.mkdtemp() cls.tmpdir = tempfile.mkdtemp()
cls.cleanup_paths += [cls.tmpdir]
cls.keyid = cls.generate_key(cls.tmpdir) cls.keyid = cls.generate_key(cls.tmpdir)
@ -98,9 +96,7 @@ enabled = 1
subprocess.check_call(['sudo', 'rm', '-f', subprocess.check_call(['sudo', 'rm', '-f',
'/etc/yum.repos.d/test.repo']) '/etc/yum.repos.d/test.repo'])
for dir in cls.cleanup_paths: shutil.rmtree(cls.tmpdir)
shutil.rmtree(dir)
cls.cleanup_paths = []
def setUp(self): def setUp(self):
super(TC_00_Dom0UpgradeMixin, self).setUp() super(TC_00_Dom0UpgradeMixin, self).setUp()