From 9ae3dc2ebf45a8a93962ecf6c3b82beaafe72a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 13 Sep 2016 02:01:22 +0200
Subject: [PATCH] tests/qvm-device: tolerate different 'column' tool versions

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.
---
 qubes/tests/tools/qvm_device.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qubes/tests/tools/qvm_device.py b/qubes/tests/tools/qvm_device.py
index 6d7232d4..5ab3476d 100644
--- a/qubes/tests/tools/qvm_device.py
+++ b/qubes/tests/tools/qvm_device.py
@@ -63,9 +63,9 @@ class TC_00_Actions(qubes.tests.QubesTestCase):
             self.assertEventNotFired(self.vm2,
                 'device-list-attached:testclass')
             self.assertEqual(
-                buf.getvalue(),
-                'vm1:testdev  Description  \n'
-                'vm2:testdev  Description  \n'
+                [x.rstrip() for x in buf.getvalue().splitlines()],
+                ['vm1:testdev  Description',
+                 'vm2:testdev  Description']
             )
 
     def test_001_list_one(self):