From 9956e4c7b3df147cc35c5adf2ff3f394fa3b53c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 24 Jun 2016 19:43:22 +0200 Subject: [PATCH] tests: handle vim opened in xterm without adjusted window title On debian vim in xterm doesn't have "vim" in title, just standard user@host. --- tests/vm_qrexec_gui.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/vm_qrexec_gui.py b/tests/vm_qrexec_gui.py index 29d4bf6a..be12ab08 100644 --- a/tests/vm_qrexec_gui.py +++ b/tests/vm_qrexec_gui.py @@ -1110,7 +1110,7 @@ class TC_20_DispVMMixin(qubes.tests.SystemTestsMixin): 'key', 'ctrl+x', 'ctrl+s']) subprocess.check_call(['xdotool', 'key', 'ctrl+x', 'ctrl+c']) - elif "vim" in window_title: + elif "vim" in window_title or "user@" in window_title: subprocess.check_call(['xdotool', 'windowactivate', '--sync', winid, 'key', 'i', 'type', 'test test 2\n']) subprocess.check_call( @@ -1571,7 +1571,7 @@ class TC_50_MimeHandlers(qubes.tests.SystemTestsMixin): def test_000_txt(self): filename = "/home/user/test_file.txt" self.prepare_txt(filename) - self.open_file_and_check_viewer(filename, ["vim"], + self.open_file_and_check_viewer(filename, ["vim", "user@"], ["gedit", "emacs"]) def test_001_pdf(self): @@ -1617,7 +1617,7 @@ class TC_50_MimeHandlers(qubes.tests.SystemTestsMixin): def test_100_txt_dispvm(self): filename = "/home/user/test_file.txt" self.prepare_txt(filename) - self.open_file_and_check_viewer(filename, ["vim"], + self.open_file_and_check_viewer(filename, ["vim", "user@"], ["gedit", "emacs"], dispvm=True)