Changeset 84863 in vbox

Timestamp:

Jun 17, 2020 1:58:21 PM (5 years ago)

Author:

vboxsync

Message:

Validation Kit/tdAddGuestCtrl.py: Added Linux support for VBoxService verbose logging and service control.

File:

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

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

@@ -1563 +1563 @@
                                               sPathSC, (sPathSC, 'stop', 'VBoxService'));
         elif oTestVm.isLinux():
-            sPathService = "/usr/sbin/service";
+            sPathService = "/sbin/rcvboxadd-service";
             if fStart is True:
                 fRc = self.oTstDrv.txsRunTest(oTxsSession, 'Starting VBoxService with verbose logging', 30 * 1000, \
-                                              sPathService, (sPathService, 'start', 'vboxadd-service'));
+                                              sPathService, (sPathService, 'start'));
             else:
                 fRc = self.oTstDrv.txsRunTest(oTxsSession, 'Stopping VBoxService', 30 * 1000, \
-                                              sPathService, (sPathService, 'stop', 'vboxadd-service'));
+                                              sPathService, (sPathService, 'stop'));
         else:
             reporter.log('Controlling VBoxService not supported for this guest yet');
@@ -1626 +1626 @@
         """
         _ = oSession;
-
-        #
-        # Wait for VBoxService to come up.
-        #
-        reporter.testStart('Waiting for VBoxService to get started');
-        fRc = self.waitForGuestFacility(oSession, vboxcon.AdditionsFacilityType_VBoxService, "VBoxService",
-                                        vboxcon.AdditionsFacilityStatus_Active);
-        reporter.testDone();
-        if not fRc:
-            return (False, oTxsSession);
 
         #
@@ -1669 +1659 @@
             fRestartVBoxService = self.oTstDrv.txsRunTest(oTxsSession, 'Enabling VBoxService verbose logging', 30 * 1000,
                                      sPathSed,
-                                    (sPathSed, '-i', '-e',
-                                     's/\\$1 \\$2 \\$3/\\$1 \\$2 \\$3 -vvvv --logfile \\/tmp\\/VBoxService\\/VBoxService.log/g',
+                                    (sPathSed, '-i', '-e', 's/'
+                                     '\\$2 \\$3'
+                                     '/'
+                                     '\\$2 \\$3 -vvvv --logfile \\/var\\/tmp\\/VBoxService\\/VBoxService.log'
+                                     '/g',
                                      '/sbin/rcvboxadd-service'));
         else:
@@ -1679 +1672 @@
             time.sleep(5);
             self.vboxServiceControl(oTxsSession, oTestVm, fStart = True);
+        else:
+            reporter.testStart('Waiting for VBoxService to get started');
+            fRc = self.waitForGuestFacility(oSession, vboxcon.AdditionsFacilityType_VBoxService, "VBoxService",
+                                            vboxcon.AdditionsFacilityStatus_Active);
+            reporter.testDone();
+            if not fRc:
+                return False;
 
         #