Changeset 83642 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Apr 9, 2020 8:26:45 AM (5 years ago)

Author:

vboxsync

Message:

Guest Control/Validation Kit: Pylint.

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py (modified) (1 diff)

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

@@ -1578 +1578 @@
     # VBoxService handling.
     #
-    def vboxServiceControl(self, oTxsSession, oTestVm, fStart): # pylint: disable=no-else-return
+    def vboxServiceControl(self, oTxsSession, oTestVm, fStart):
         """
         Controls VBoxService on the guest by starting or stopping the service.
         Returns success indicator.
         """
+
+        fRc = True;
+
         if oTestVm.isWindows():
             sPathSC = os.path.join(self.getGuestSystemDir(oTestVm), 'sc.exe');
             if fStart is True:
-                return self.oTstDrv.txsRunTest(oTxsSession, 'Starting VBoxService with verbose logging', 30 * 1000, \
-                                               sPathSC, (sPathSC, 'start', 'VBoxService'));
+                fRc = self.oTstDrv.txsRunTest(oTxsSession, 'Starting VBoxService with verbose logging', 30 * 1000, \
+                                              sPathSC, (sPathSC, 'start', 'VBoxService'));
             else:
-                return self.oTstDrv.txsRunTest(oTxsSession, 'Stopping VBoxService', 30 * 1000, \
-                                               sPathSC, (sPathSC, 'stop', 'VBoxService'));
+                fRc = self.oTstDrv.txsRunTest(oTxsSession, 'Stopping VBoxService', 30 * 1000, \
+                                              sPathSC, (sPathSC, 'stop', 'VBoxService'));
         else:
             reporter.log('Controlling VBoxService not supported for this guest yet');
 
-        return True;
+        return fRc;
 
     #