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

tests: fix newline input in DispVM editor tests

Browse Source 
Just '\n' isn't enough for xdotool to enter newline.
This commit is contained in:
Marek Marczykowski-Górecki 2016-08-02 02:13:58 +02:00
parent 72d60788e4
commit 5c9157be05
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/dispvm.py
View File

@ -330,7 +330,9 @@ 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'])
subprocess.check_call(['xdotool', 'key', '--window', winid,
'key', 'Return'])
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'])
@ -345,14 +347,18 @@ class TC_20_DispVMMixin(qubes.tests.SystemTestsMixin):
winid = search.stdout.read().strip() winid = search.stdout.read().strip()
time.sleep(0.5) time.sleep(0.5)
subprocess.check_call(['xdotool', 'windowactivate', '--sync', winid, subprocess.check_call(['xdotool', 'windowactivate', '--sync', winid,
'type', 'Test test 2\n']) 'type', 'Test test 2'])
subprocess.check_call(['xdotool', 'key', '--window', winid,
'key', 'Return'])
time.sleep(0.5) time.sleep(0.5)
subprocess.check_call(['xdotool', subprocess.check_call(['xdotool',
'key', '--delay', '100', 'ctrl+s', 'key', '--delay', '100', 'ctrl+s',
'Return', 'ctrl+q']) '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'])
subprocess.check_call(['xdotool', 'key', '--window', winid,
'key', 'Return'])
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'])
@ -360,7 +366,9 @@ 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'])
subprocess.check_call(['xdotool', 'key', '--window', winid,
'key', 'Return'])
subprocess.check_call( subprocess.check_call(
['xdotool', ['xdotool',
'key', 'Escape', 'colon', 'w', 'q', 'Return']) 'key', 'Escape', 'colon', 'w', 'q', 'Return'])