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

tests/qvm-device: tolerate different 'column' tool versions

Browse Source 
Newer one do output column even if empty, but older one (in Travis-CI
env) do not. Ignore trailing spaces to work with both version.
This commit is contained in:
Marek Marczykowski-Górecki 2016-09-13 02:01:22 +02:00
parent 141128e768
commit 9ae3dc2ebf
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubes/tests/tools/qvm_device.py
View File

@ -63,9 +63,9 @@ class TC_00_Actions(qubes.tests.QubesTestCase):
self.assertEventNotFired(self.vm2, self.assertEventNotFired(self.vm2,
'device-list-attached:testclass') 'device-list-attached:testclass')
self.assertEqual( self.assertEqual(
buf.getvalue(), [x.rstrip() for x in buf.getvalue().splitlines()],
'vm1:testdev Description \n' ['vm1:testdev Description',
'vm2:testdev Description \n' 'vm2:testdev Description']
) )
def test_001_list_one(self): def test_001_list_one(self):