From 0011fa6afd14e5b9f4f154d476d92cfc161267a6 Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Tue, 14 Sep 2021 20:24:37 +1200 Subject: [PATCH] Specs: extract check_de_was_setup_to_run() --- spec/vncserver_spec.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/spec/vncserver_spec.py b/spec/vncserver_spec.py index bab8e37..b330707 100644 --- a/spec/vncserver_spec.py +++ b/spec/vncserver_spec.py @@ -24,6 +24,11 @@ def kill_xvnc(): run_cmd('vncserver -kill :1') +def check_de_was_setup_to_run(de_name): + completed_process = run_cmd(f'grep -q {de_name} ~/.vnc/xstartup') + expect(completed_process.returncode).to(equal(0)) + + with description('vncserver') as self: with it('selects passed DE with -s'): add_kasmvnc_user_docker() @@ -33,8 +38,7 @@ with description('vncserver') as self: completed_process = run_cmd(cmd) expect(completed_process.returncode).to(equal(0)) - completed_process = run_cmd('grep -q mate ~/.vnc/xstartup') - expect(completed_process.returncode).to(equal(0)) + check_de_was_setup_to_run('mate') finally: kill_xvnc() @@ -46,7 +50,6 @@ with description('vncserver') as self: completed_process = run_cmd(cmd, input="1\ny\n") expect(completed_process.returncode).to(equal(0)) - completed_process = run_cmd('grep -q cinnamon ~/.vnc/xstartup') - expect(completed_process.returncode).to(equal(0)) + check_de_was_setup_to_run('cinnamon') finally: kill_xvnc()