Changeset 77479 in vbox for trunk/src/VBox/ValidationKit/tests

Timestamp:

Feb 27, 2019 11:47:38 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

129069

Message:

Guest Control/Validation Kit: Made all existing tests pass on Linux guests.

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py (modified) (10 diffs)

trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py

@@ -107 +107 @@
 
             ## @todo fix this so all VMs have several usable test users with the same passwords (or none).
-            sUser     = 'test';
+            if oTestVm.isWindows():
+                sUser = 'Administrator';
+            else:
+                sUser = 'vbox';
             sPassword = 'password';
-            if oTestVm.isWindows():
-                #sPassword = ''; # stupid config mistake.
-                sPassword = 'password';
-                sUser     = 'Administrator';
             sDomain   = '';
 
@@ -1634 +1633 @@
             sDomain = "";
             sFile = "C:\\windows\\system32\\kernel32.dll";
+        elif oTestVm.isLinux():
+            sUser = "vbox";
+            sPassword = "password";
+            sDomain = "";
+            sFile = "/bin/sh";
 
         # Number of stale guest files to create.
@@ -1770 +1774 @@
             sCmd = "C:\\windows\\system32\\cmd.exe";
             aArgs = [sCmd,];
+        elif oTestVm.isLinux():
+            sUser = "vbox";
+            sPassword = "password";
+            sDomain = "";
+            sCmd = "/bin/sh";
+            aArgs = [sCmd,];
 
         # Number of stale guest processes to create.
@@ -1824 +1834 @@
                 if oTestVm.isWindows():
                     aArgs = [ sCmd, '/C', 'dir', '/S', 'C:\\Windows\\system'];
+                else:
+                    aArgs = [ sCmd, '-c', 'date'];
                 reporter.log2('Starting non-stale processes');
                 aaProcs = [];
@@ -1874 +1886 @@
                 if oTestVm.isWindows():
                     aArgs = [ sCmd, '/C', 'dir', '/S', 'C:\\Windows'];
+                else:
+                    aArgs = [ sCmd ];
                 reporter.log2('Starting blocking processes');
                 aaProcs = [];
@@ -1922 +1936 @@
 
         if oTestVm.isWindows():
-            # Outputting stuff.
             sImageOut = "C:\\windows\\system32\\cmd.exe";
         else:
-            reporter.error('Implement me!'); ## @todo Implement non-Windows bits.
-            return (False, oTxsSession);
+            sImageOut = "/bin/sh";
 
         aaInvalid = [
@@ -2171 +2183 @@
 
         if oTestVm.isWindows():
-            # Outputting stuff.
             sImage = "C:\\windows\\system32\\cmd.exe";
         else:
-            reporter.error('Implement me!'); ## @todo Implement non-Windows bits.
-            return (False, oTxsSession);
+            sImage = "/bin/sh";
 
         aaTests = [];
@@ -2273 +2283 @@
             sUser = "vbox";
         sPassword = "password";
-        sDomain = "";
+        sDomain   = "";
 
         if oTestVm.isWindows():
-            # Outputting stuff.
             sImage = "C:\\windows\\system32\\cmd.exe";
         else:
-            reporter.error('Implement me!'); ## @todo Implement non-Windows bits.
-            return (False, oTxsSession);
+            sImage = "/bin/sh";
 
         fRc = True;
@@ -2367 +2375 @@
         if oTestVm.isWindows():
             sScratch  = "C:\\Temp\\vboxtest\\testGuestCtrlDirCreate\\";
+        else:
+            sScratch  = "/tmp/testGuestCtrlDirCreate/";
 
         aaTests = [];
@@ -2444 +2454 @@
             sUser = "vbox";
         sPassword = "password";
-
-        # if oTestVm.isWindows():
-        #     sScratch = "C:\\Temp\\vboxtest\\testGuestCtrlDirCreateTemp\\";
 
         aaTests = [];