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

Timestamp:

Jun 14, 2020 7:12:04 PM (4 years ago)

Author:

vboxsync

Message:

Validation Kit/tdAddGuestCtrl: More fixes for VBoxService logging.

File:

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

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

@@ -1354 +1354 @@
     def __init__(self, sImgPath = None):
         self.sImgPath = sImgPath;
-        self.sVBoxServiceLogPath = '';
+        self.sGstVBoxServiceLogPath = '';
         self.fNoExit = False;
 
@@ -1486 +1486 @@
 
         # Upload VBoxService logs on failure.
-        if  not fRc \
-        and self.oDebug.sVBoxServiceLogPath:
+        if  reporter.testErrorCount() > 0 \
+        and self.oDebug.sGstVBoxServiceLogPath:
             sVBoxServiceLogsTarGz    = 'ga-vboxservice-logs-%s.tar.gz' % oTestVm.sVmName;
-            sVBoxServiceLogsTarGzAbs = oTestVm.pathJoin(self.oTstDrv.getGuestTempDir(oTestVm), sVBoxServiceLogsTarGz);
+            sGstVBoxServiceLogsTarGz = oTestVm.pathJoin(self.oTstDrv.getGuestTempDir(oTestVm), sVBoxServiceLogsTarGz);
             if self.oTstDrv.txsPackFile(oSession, oTxsSession, \
-                                        sVBoxServiceLogsTarGzAbs, self.oDebug.sVBoxServiceLogPath, fIgnoreErrors = True):
-                self.oTstDrv.txsDownloadFiles(oSession, oTxsSession, [ (sVBoxServiceLogsTarGzAbs, sVBoxServiceLogsTarGz) ], \
+                                        sGstVBoxServiceLogsTarGz, self.oDebug.sGstVBoxServiceLogPath, fIgnoreErrors = True):
+                self.oTstDrv.txsDownloadFiles(oSession, oTxsSession, [ (sGstVBoxServiceLogsTarGz, sVBoxServiceLogsTarGz) ], \
                                               fIgnoreErrors = True);
 
@@ -1639 +1639 @@
         # Enable VBoxService verbose logging.
         #
-        self.oDebug.sVBoxServiceLogPath = oTestVm.pathJoin(self.oTstDrv.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 = oTestVm.pathJoin(self.oDebug.sVBoxServiceLogPath, 'VBoxService.log');
-
-        reporter.log('VBoxService logs will be stored in "%s"' % (self.oDebug.sVBoxServiceLogPath,));
+        self.oDebug.sGstVBoxServiceLogPath = oTestVm.pathJoin(self.oTstDrv.getGuestTempDir(oTestVm), "VBoxService");
+        if oTxsSession.syncMkDirPath(self.oDebug.sGstVBoxServiceLogPath, 0o777) is not True:
+            return reporter.error('Failed to create directory "%s"!' % (self.oDebug.sGstVBoxServiceLogPath,));
+        sPathLogFile = oTestVm.pathJoin(self.oDebug.sGstVBoxServiceLogPath, 'VBoxService.log');
+
+        reporter.log('VBoxService logs will be stored in "%s"' % (self.oDebug.sGstVBoxServiceLogPath,));
 
         if oTestVm.isWindows():