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

Timestamp:

Apr 18, 2020 1:16:17 PM (5 years ago)

Author:

vboxsync

Message:

ValKit/tdAddGuestCtrl.py: Use oTestVm.pathJoin instead of whatever r137254 was doing. The method has been there fore 10 months or so...

File:

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

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

@@ -1617 +1617 @@
                 return reporter.error('Failed to create directory "%s"!' % (sDir,));
 
-        if oTestVm.isWindows():
-            sGuestSlash = '\\';
-        else:
-            sGuestSlash = '/';
-
         #
         # Enable VBoxService verbose logging.
         #
-        self.oDebug.sVBoxServiceLogPath = self.getGuestTempDir(oTestVm) + sGuestSlash + "VBoxService";
+        self.oDebug.sVBoxServiceLogPath = oTestVm.pathJoin(self.getGuestTempDir(oTestVm), "VBoxService");
         if oTxsSession.syncMkDirPath(self.oDebug.sVBoxServiceLogPath, 0o777) is not True:
             return reporter.error('Failed to create directory "%s"!' % (self.oDebug.sVBoxServiceLogPath,));
-        sPathLogFile = os.path.join(self.oDebug.sVBoxServiceLogPath, 'VBoxService.log');
+        sPathLogFile = oTestVm.pathJoin(self.oDebug.sVBoxServiceLogPath, 'VBoxService.log');
 
         reporter.log('VBoxService logs will be stored in "%s"' % (self.oDebug.sVBoxServiceLogPath,));
 
         if oTestVm.isWindows():
-            sPathRegExe         = self.getGuestSystemDir(oTestVm) + sGuestSlash + 'reg.exe';
-            sPathVBoxServiceExe = self.getGuestSystemDir(oTestVm) + sGuestSlash + 'VBoxService.exe';
+            sPathRegExe         = oTestVm.pathJoin(self.getGuestSystemDir(oTestVm), 'reg.exe');
+            sPathVBoxServiceExe = oTestVm.pathJoin(self.getGuestSystemDir(oTestVm), 'VBoxService.exe');
             sImagePath          = '%s -vvvv --logfile %s' % (sPathVBoxServiceExe, sPathLogFile);
             self.oTstDrv.txsRunTest(oTxsSession, 'Enabling VBoxService verbose logging (via registry)', 30 * 1000,