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

tests: allow LibreOffice as txt file editor

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2016-07-19 02:07:14 +02:00
parent 9d1b7504da
commit 9f7668af77
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/vm_qrexec_gui.py
View File

@ -1098,13 +1098,29 @@ class TC_20_DispVMMixin(qubes.tests.SystemTestsMixin):
time.sleep(1) time.sleep(1)
if "gedit" in window_title: if "gedit" in window_title:
subprocess.check_call(['xdotool', 'windowactivate', '--sync', winid, subprocess.check_call(['xdotool', 'windowactivate', '--sync', winid,
'type', 'test test 2\n']) 'type', 'Test test 2\n'])
time.sleep(0.5) time.sleep(0.5)
subprocess.check_call(['xdotool', subprocess.check_call(['xdotool',
'key', 'ctrl+s', 'ctrl+q']) 'key', 'ctrl+s', 'ctrl+q'])
elif "LibreOffice" in window_title:
# wait for actual editor (we've got splash screen)
search = subprocess.Popen(['xdotool', 'search', '--sync',
'--onlyvisible', '--all', '--name', '--class', 'disp*|Writer'],
stdout=subprocess.PIPE,
stderr=open(os.path.devnull, 'w'))
retcode = search.wait()
if retcode == 0:
winid = search.stdout.read().strip()
time.sleep(0.5)
subprocess.check_call(['xdotool', 'windowactivate', '--sync', winid,
'type', 'Test test 2\n'])
time.sleep(0.5)
subprocess.check_call(['xdotool',
'key', '--delay', '100', 'ctrl+s',
'Return', 'ctrl+q'])
elif "emacs" in window_title: elif "emacs" in window_title:
subprocess.check_call(['xdotool', 'windowactivate', '--sync', winid, subprocess.check_call(['xdotool', 'windowactivate', '--sync', winid,
'type', 'test test 2\n']) 'type', 'Test test 2\n'])
time.sleep(0.5) time.sleep(0.5)
subprocess.check_call(['xdotool', subprocess.check_call(['xdotool',
'key', 'ctrl+x', 'ctrl+s']) 'key', 'ctrl+x', 'ctrl+s'])
@ -1112,7 +1128,7 @@ class TC_20_DispVMMixin(qubes.tests.SystemTestsMixin):
'key', 'ctrl+x', 'ctrl+c']) 'key', 'ctrl+x', 'ctrl+c'])
elif "vim" in window_title or "user@" in window_title: elif "vim" in window_title or "user@" in window_title:
subprocess.check_call(['xdotool', 'windowactivate', '--sync', winid, subprocess.check_call(['xdotool', 'windowactivate', '--sync', winid,
'key', 'i', 'type', 'test test 2\n']) 'key', 'i', 'type', 'Test test 2\n'])
subprocess.check_call( subprocess.check_call(
['xdotool', ['xdotool',
'key', 'Escape', 'colon', 'w', 'q', 'Return']) 'key', 'Escape', 'colon', 'w', 'q', 'Return'])
@ -1158,7 +1174,10 @@ class TC_20_DispVMMixin(qubes.tests.SystemTestsMixin):
p = testvm1.run("cat /home/user/test.txt", p = testvm1.run("cat /home/user/test.txt",
passio_popen=True) passio_popen=True)
(test_txt_content, _) = p.communicate() (test_txt_content, _) = p.communicate()
self.assertEqual(test_txt_content, "test test 2\ntest1\n") # Drop BOM if added by editor
if test_txt_content.startswith('\xef\xbb\xbf'):
test_txt_content = test_txt_content[3:]
self.assertEqual(test_txt_content, "Test test 2\ntest1\n")
class TC_30_Gui_daemon(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase): class TC_30_Gui_daemon(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
@ -1572,7 +1591,7 @@ class TC_50_MimeHandlers(qubes.tests.SystemTestsMixin):
filename = "/home/user/test_file.txt" filename = "/home/user/test_file.txt"
self.prepare_txt(filename) self.prepare_txt(filename)
self.open_file_and_check_viewer(filename, ["vim", "user@"], self.open_file_and_check_viewer(filename, ["vim", "user@"],
["gedit", "emacs"]) ["gedit", "emacs", "libreoffice"])
def test_001_pdf(self): def test_001_pdf(self):
filename = "/home/user/test_file.pdf" filename = "/home/user/test_file.pdf"
@ -1618,7 +1637,7 @@ class TC_50_MimeHandlers(qubes.tests.SystemTestsMixin):
filename = "/home/user/test_file.txt" filename = "/home/user/test_file.txt"
self.prepare_txt(filename) self.prepare_txt(filename)
self.open_file_and_check_viewer(filename, ["vim", "user@"], self.open_file_and_check_viewer(filename, ["vim", "user@"],
["gedit", "emacs"], ["gedit", "emacs", "libreoffice"],
dispvm=True) dispvm=True)
def test_101_pdf_dispvm(self): def test_101_pdf_dispvm(self):