Replace user creation with cmd line option

Signed-off-by: Samuli Leivo <[email protected]>
tiiuae · Dec 16, 2024 · 25ce4e3 · 25ce4e3
1 parent 693be53
commit 25ce4e3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/Robot-Framework/resources/gui_keywords.resource b/Robot-Framework/resources/gui_keywords.resource
@@ -151,12 +151,3 @@ GUI Unlock
     Start ydotoold
     Log To Console     Typing password to unlock
     Type string and press enter  ${PASSWORD}
-
-Initial user creation
-    [Documentation]   At first boot create user credentials via ydotool
-    Log To Console               Setting user name and password
-    Start ydotoold
-    Type string and press enter  ${USER_LOGIN}
-    Type string and press enter  ${USER_LOGIN}
-    Type string and press enter  ${USER_PASSWORD}
-    Type string and press enter  ${USER_PASSWORD}
diff --git a/Robot-Framework/resources/ssh_keywords.resource b/Robot-Framework/resources/ssh_keywords.resource
@@ -497,6 +497,11 @@ Detect first boot
     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}
+    RETURN   ${True}
+
+Create test user
+    Log To Console      Creating test user
+    Execute Command     systemctl start setup-test-user.service  sudo=True  sudo_password=${password}
diff --git a/Robot-Framework/test-suites/bat-tests/__init__.robot b/Robot-Framework/test-suites/bat-tests/__init__.robot
@@ -6,7 +6,6 @@ Documentation       BAT tests
 Resource            ../../resources/ssh_keywords.resource
 Resource            ../../resources/serial_keywords.resource
 Resource            ../../resources/common_keywords.resource
-Resource            ../../resources/gui_keywords.resource
 Suite Setup         Common Setup
 Suite Teardown      Common Teardown
 
@@ -35,11 +34,10 @@ Common Setup
             ${connection}         Connect
             Connect to netvm
             Connect to VM         ${GUI_VM}
-            Initial user creation
+            Create test user
         END
         Close All Connections
         ${connection}             Connect
-        # BuiltIn.Sleep              20
     END
 
 Common Teardown