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

tests: update yaml syntax in qvm-backup tests

Browse Source 
yaml.safe_dump() finally produces canonical yaml output, not a
one-liner.
This commit is contained in:
Marek Marczykowski-Górecki 2019-04-16 23:10:38 +02:00
parent 2f1be16635
commit 37e4e4c6ca
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
qubesadmin/tests/tools/qvm_backup.py
View File

@ -33,8 +33,10 @@ class TC_00_qvm_backup(qubesadmin.tests.QubesTestCase):
profile = io.StringIO() profile = io.StringIO()
qvm_backup.write_backup_profile(profile, args) qvm_backup.write_backup_profile(profile, args)
expected_profile = ( expected_profile = (
'{compression: true, destination_path: /var/tmp, ' 'compression: true\n'
'destination_vm: dom0, include: null}\n' 'destination_path: /var/tmp\n'
'destination_vm: dom0\n'
'include: null\n'
) )
self.assertEqual(profile.getvalue(), expected_profile) self.assertEqual(profile.getvalue(), expected_profile)
@ -52,7 +54,9 @@ class TC_00_qvm_backup(qubesadmin.tests.QubesTestCase):
'compression: true\n' 'compression: true\n'
'destination_path: /var/tmp\n' 'destination_path: /var/tmp\n'
'destination_vm: dom0\n' 'destination_vm: dom0\n'
'include: [vm1, vm2]\n' 'include:\n'
'- vm1\n'
'- vm2\n'
) )
self.assertEqual(profile.getvalue(), expected_profile) self.assertEqual(profile.getvalue(), expected_profile)
self.assertAllCalled() self.assertAllCalled()
@ -66,7 +70,9 @@ class TC_00_qvm_backup(qubesadmin.tests.QubesTestCase):
'compression: true\n' 'compression: true\n'
'destination_path: /var/tmp\n' 'destination_path: /var/tmp\n'
'destination_vm: dom0\n' 'destination_vm: dom0\n'
'exclude: [vm1, vm2]\n' 'exclude:\n'
'- vm1\n'
'- vm2\n'
'include: null\n' 'include: null\n'
) )
self.assertEqual(profile.getvalue(), expected_profile) self.assertEqual(profile.getvalue(), expected_profile)
@ -76,9 +82,11 @@ class TC_00_qvm_backup(qubesadmin.tests.QubesTestCase):
profile = io.StringIO() profile = io.StringIO()
qvm_backup.write_backup_profile(profile, args, passphrase='test123') qvm_backup.write_backup_profile(profile, args, passphrase='test123')
expected_profile = ( expected_profile = (
'{compression: true, destination_path: /var/tmp, ' 'compression: true\n'
'destination_vm: dom0, include: null,\n' 'destination_path: /var/tmp\n'
' passphrase_text: test123}\n' 'destination_vm: dom0\n'
'include: null\n'
'passphrase_text: test123\n'
) )
self.assertEqual(profile.getvalue(), expected_profile) self.assertEqual(profile.getvalue(), expected_profile)
@ -88,8 +96,10 @@ class TC_00_qvm_backup(qubesadmin.tests.QubesTestCase):
profile = io.StringIO() profile = io.StringIO()
qvm_backup.write_backup_profile(profile, args) qvm_backup.write_backup_profile(profile, args)
expected_profile = ( expected_profile = (
'{compression: false, destination_path: /var/tmp, ' 'compression: false\n'
'destination_vm: dom0, include: null}\n' 'destination_path: /var/tmp\n'
'destination_vm: dom0\n'
'include: null\n'
) )
self.assertEqual(profile.getvalue(), expected_profile) self.assertEqual(profile.getvalue(), expected_profile)
@ -109,8 +119,10 @@ class TC_00_qvm_backup(qubesadmin.tests.QubesTestCase):
qvm_backup.main(['--save-profile', 'test-profile', '/var/tmp'], qvm_backup.main(['--save-profile', 'test-profile', '/var/tmp'],
app=self.app) app=self.app)
expected_profile = ( expected_profile = (
'{compression: true, destination_path: /var/tmp, ' 'compression: true\n'
'destination_vm: dom0, include: null}\n' 'destination_path: /var/tmp\n'
'destination_vm: dom0\n'
'include: null\n'
) )
with open(profile_path) as f: with open(profile_path) as f:
self.assertEqual(expected_profile, f.read()) self.assertEqual(expected_profile, f.read())
@ -136,9 +148,11 @@ class TC_00_qvm_backup(qubesadmin.tests.QubesTestCase):
qvm_backup.main(['--save-profile', 'test-profile', '/var/tmp'], qvm_backup.main(['--save-profile', 'test-profile', '/var/tmp'],
app=self.app) app=self.app)
expected_profile = ( expected_profile = (
'{compression: true, destination_path: /var/tmp, ' 'compression: true\n'
'destination_vm: dom0, include: null,\n' 'destination_path: /var/tmp\n'
' passphrase_text: some password}\n' 'destination_vm: dom0\n'
'include: null\n'
'passphrase_text: some password\n'
) )
with open(profile_path) as f: with open(profile_path) as f:
self.assertEqual(expected_profile, f.read()) self.assertEqual(expected_profile, f.read())
@ -198,7 +212,8 @@ class TC_00_qvm_backup(qubesadmin.tests.QubesTestCase):
'compression: true\n' 'compression: true\n'
'destination_path: /var/tmp\n' 'destination_path: /var/tmp\n'
'destination_vm: dom0\n' 'destination_vm: dom0\n'
'exclude: [vm1]\n' 'exclude:\n'
'- vm1\n'
'include: null\n' 'include: null\n'
'# specify backup passphrase below\n' '# specify backup passphrase below\n'
'passphrase_text: ...\n' 'passphrase_text: ...\n'
@ -229,9 +244,11 @@ class TC_00_qvm_backup(qubesadmin.tests.QubesTestCase):
'test-profile', '/var/tmp'], 'test-profile', '/var/tmp'],
app=self.app) app=self.app)
expected_profile = ( expected_profile = (
'{compression: true, destination_path: /var/tmp, ' 'compression: true\n'
'destination_vm: dom0, include: null,\n' 'destination_path: /var/tmp\n'
' passphrase_text: other passphrase}\n' 'destination_vm: dom0\n'
'include: null\n'
'passphrase_text: other passphrase\n'
) )
with open(profile_path) as f: with open(profile_path) as f:
self.assertEqual(expected_profile, f.read()) self.assertEqual(expected_profile, f.read())