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

tests/salt: don't depend on initial tags set

Browse Source 
Some extensions may add tags at VM creation (guivm-*, audiovm-*). Take
this into account when calculating expected tags.
This commit is contained in:
Marek Marczykowski-Górecki 2020-03-01 02:20:19 +01:00
parent ec88796129
commit 6874c7fece
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qubes/tests/integ/salt.py
View File

@ -206,8 +206,10 @@ class TC_00_Dom0(SaltTestMixin, qubes.tests.SystemTestCase):
vm = self.app.add_new_vm('AppVM', label='red', vm = self.app.add_new_vm('AppVM', label='red',
name=vmname) name=vmname)
self.loop.run_until_complete(vm.create_on_disk()) self.loop.run_until_complete(vm.create_on_disk())
new_tags = list(sorted(list(vm.tags) + ['tag1', 'tag2']))
vm.tags.add('tag1') vm.tags.add('tag1')
vm.tags.add('tag3') vm.tags.add('tag3')
old_tags = list(sorted(vm.tags))
with open(os.path.join(self.salt_testdir, 'test_state.sls'), 'w') as f: with open(os.path.join(self.salt_testdir, 'test_state.sls'), 'w') as f:
f.write(vmname + ':\n') f.write(vmname + ':\n')
@ -224,13 +226,14 @@ class TC_00_Dom0(SaltTestMixin, qubes.tests.SystemTestCase):
state_out = list(cmd_output['local'].values())[0] state_out = list(cmd_output['local'].values())[0]
del state_out['start_time'] del state_out['start_time']
del state_out['duration'] del state_out['duration']
self.maxDiff = None
self.assertEqual(state_out, { self.assertEqual(state_out, {
'comment': '====== [\'tags\'] ======\n', 'comment': '====== [\'tags\'] ======\n',
'name': vmname, 'name': vmname,
'result': True, 'result': True,
'changes': { 'changes': {
'qvm.tags': {'qvm.tags': { 'qvm.tags': {'qvm.tags': {
'new': ['tag1', 'tag2'], 'old': ['tag1', 'tag3'], 'new': new_tags, 'old': old_tags,
} }
}, },
}, },
@ -241,7 +244,7 @@ class TC_00_Dom0(SaltTestMixin, qubes.tests.SystemTestCase):
self.assertIn(vmname, self.app.domains) self.assertIn(vmname, self.app.domains)
vm = self.app.domains[vmname] vm = self.app.domains[vmname]
self.assertEqual(set(vm.tags), {'tag1', 'tag2'}) self.assertEqual(set(vm.tags), set(new_tags))
def test_020_qubes_pillar(self): def test_020_qubes_pillar(self):
vmname = self.make_vm_name('appvm') vmname = self.make_vm_name('appvm')