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

tests: handle older df version in resize private.img tests

Browse Source 
df --output=size isn't available in Debian (7, 8).
This commit is contained in:
Marek Marczykowski-Górecki 2015-11-25 03:15:23 +01:00
parent a14e1cc86f
commit 64343572c1
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/vm_qrexec_gui.py
View File

@ -693,7 +693,9 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
# First offline test # First offline test
self.testvm1.resize_private_img(4*1024**3) self.testvm1.resize_private_img(4*1024**3)
self.testvm1.start() self.testvm1.start()
p = self.testvm1.run('df --output=size /rw|tail -n 1', df_cmd = '( df --output=size /rw || df /rw | awk \'{print $2}\' )|' \
'tail -n 1'
p = self.testvm1.run(df_cmd,
passio_popen=True) passio_popen=True)
# new_size in 1k-blocks # new_size in 1k-blocks
(new_size, _) = p.communicate() (new_size, _) = p.communicate()
@ -701,7 +703,7 @@ class TC_00_AppVMMixin(qubes.tests.SystemTestsMixin):
self.assertGreater(int(new_size.strip()), 3.8*1024**2) self.assertGreater(int(new_size.strip()), 3.8*1024**2)
# Then online test # Then online test
self.testvm1.resize_private_img(6*1024**3) self.testvm1.resize_private_img(6*1024**3)
p = self.testvm1.run('df --output=size /rw|tail -n 1', p = self.testvm1.run(df_cmd,
passio_popen=True) passio_popen=True)
# new_size in 1k-blocks # new_size in 1k-blocks
(new_size, _) = p.communicate() (new_size, _) = p.communicate()