-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adapt to changes introduced by ghaf PR827
Signed-off-by: Samuli Leivo <[email protected]>
- Loading branch information
1 parent
cdad17a
commit 72ffc48
Showing
7 changed files
with
64 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -151,4 +151,3 @@ GUI Unlock | |
| Start ydotoold | ||
| Log To Console Typing password to unlock | ||
| Type string and press enter ${PASSWORD} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -94,14 +94,14 @@ Connect to netvm | |
| RETURN ${netvm_ssh} | ||
|
|
||
| Connect to VM | ||
| [Arguments] ${vm_name} | ||
| [Arguments] ${vm_name} ${user}=${LOGIN} ${pw}=${PASSWORD} | ||
| Log To Console Connecting to ${vm_name} | ||
| Check if ssh is ready on vm ${vm_name} | ||
| ${failed_connection} Set variable True | ||
| FOR ${i} IN RANGE 3 | ||
| TRY | ||
| ${connection}= Open Connection ${vm_name} port=22 prompt=\$ timeout=30 | ||
| ${output}= Login username=${LOGIN} password=${PASSWORD} jumphost_index_or_alias=${netvm_ssh} | ||
| ${output}= Login username=${user} password=${pw} jumphost_index_or_alias=${netvm_ssh} | ||
| EXCEPT ChannelException: ChannelException(2, 'Connect failed') type=LITERAL | ||
| Sleep 1 | ||
| CONTINUE | ||
|
|
@@ -184,12 +184,12 @@ Find pid by name | |
| RETURN @{pids} | ||
|
|
||
| Kill process | ||
| [Arguments] @{pids} ${sig}=15 | ||
| [Arguments] @{pids} ${sig}=9 | ||
| FOR ${pid} IN @{pids} | ||
| IF '${PID}' == '${EMPTY}' | ||
| BREAK | ||
| END | ||
| Execute Command kill -${sig} ${pid} | ||
| Execute Command kill -${sig} ${pid} sudo=True sudo_password=${password} timeout=15 | ||
| FOR ${i} IN RANGE 5 | ||
| ${ps_exists}= Is Process Started ${pid} | ||
| IF ${ps_exists} | ||
|
|
@@ -489,3 +489,19 @@ Connect to VM if not already connected | |
| Connect to netvm | ||
| Connect to VM ${vm_name} | ||
| END | ||
|
|
||
| Detect first boot | ||
| [Documentation] Determine desktop state after boot by attempting login to gui-vm as testuser | ||
| Log To Console Detecting if this is first boot by trying test user credentials | ||
| Verify service status range=15 [email protected] expected_status=active expected_state=running | ||
| Connect to netvm | ||
| ${status} ${output} Run Keyword And Ignore Error Connect to VM ${GUI_VM} ${USER_LOGIN} ${USER_PASSWORD} | ||
| IF $status=='PASS' | ||
| Log To Console Test user exists | ||
| RETURN ${False} | ||
| END | ||
| RETURN ${True} | ||
|
|
||
| Create test user | ||
| Log To Console Creating test user | ||
| Execute Command systemctl start setup-test-user.service sudo=True sudo_password=${password} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,7 +31,7 @@ Start Chrome on LenovoX1 | |
| [Tags] bat pre-merge SP-T92 lenovo-x1 | ||
| Verify service status range=15 [email protected] expected_status=active expected_state=running | ||
| Connect to netvm | ||
| Connect to VM ${GUI_VM} | ||
| Connect to VM ${GUI_VM} ${USER_LOGIN} ${USER_PASSWORD} | ||
| Check if ssh is ready on vm ${CHROME_VM} | ||
| Start XDG application 'Google Chrome' | ||
| Connect to VM ${CHROME_VM} | ||
|
|
@@ -42,7 +42,7 @@ Start Zathura on LenovoX1 | |
| [Documentation] Start Zathura in dedicated VM and verify process started | ||
| [Tags] bat pre-merge SP-T105 lenovo-x1 | ||
| [Setup] Connect to netvm | ||
| Connect to VM ${GUI_VM} | ||
| Connect to VM ${GUI_VM} ${USER_LOGIN} ${USER_PASSWORD} | ||
| Check if ssh is ready on vm ${ZATHURA_VM} | ||
| Start XDG application 'PDF Viewer' | ||
| Connect to VM ${ZATHURA_VM} | ||
|
|
@@ -55,7 +55,7 @@ Start Gala on LenovoX1 | |
| [Documentation] Start Gala in dedicated VM and verify process started | ||
| [Tags] bat pre-merge SP-T104 lenovo-x1 | ||
| [Setup] Connect to netvm | ||
| Connect to VM ${GUI_VM} | ||
| Connect to VM ${GUI_VM} ${USER_LOGIN} ${USER_PASSWORD} | ||
| Check if ssh is ready on vm ${GALA_VM} | ||
| Start XDG application GALA | ||
| Connect to VM ${GALA_VM} | ||
|
|
@@ -66,7 +66,7 @@ Start Element on LenovoX1 | |
| [Documentation] Start Element in dedicated VM and verify process started | ||
| [Tags] bat pre-merge SP-T52 lenovo-x1 | ||
| [Setup] Connect to netvm | ||
| Connect to VM ${GUI_VM} | ||
| Connect to VM ${GUI_VM} ${USER_LOGIN} ${USER_PASSWORD} | ||
| Check if ssh is ready on vm ${COMMS_VM} | ||
| Start XDG application Element | ||
| Connect to VM ${COMMS_VM} | ||
|
|
@@ -77,7 +77,7 @@ Start Slack on LenovoX1 | |
| [Documentation] Start Slack in dedicated VM and verify process started | ||
| [Tags] bat pre-merge SP-T181 lenovo-x1 | ||
| [Setup] Connect to netvm | ||
| Connect to VM ${GUI_VM} | ||
| Connect to VM ${GUI_VM} ${USER_LOGIN} ${USER_PASSWORD} | ||
| Check if ssh is ready on vm ${COMMS_VM} | ||
| Start XDG application Slack | ||
| Connect to VM ${COMMS_VM} | ||
|
|
@@ -88,7 +88,7 @@ Start Appflowy on LenovoX1 | |
| [Documentation] Start Appflowy in dedicated VM and verify process started | ||
| [Tags] appflowy # Removed bat tag & lenovo-x1 tag until final decision of this app is made | ||
| [Setup] Connect to netvm | ||
| Connect to VM ${GUI_VM} | ||
| Connect to VM ${GUI_VM} ${USER_LOGIN} ${USER_PASSWORD} | ||
| Check if ssh is ready on vm appflowy-vm | ||
| Start XDG application AppFlowy | ||
| Connect to VM ${APPFLOWY_VM} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters