Changeset 103587 in vbox for trunk/src/VBox

Timestamp:

Feb 27, 2024 1:06:51 PM (12 months ago)

Author:

vboxsync

Message:

ValKit: remoteexecutor.py, added logging for rmTree function; vboxtestvms.py, switched win8-64 vm as previos one had Administrator user was disabled unexpectedly

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vboxtestvms.py (modified) (1 diff)
• tests/storage/remoteexecutor.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testdriver/vboxtestvms.py

@@ -2224 +2224 @@
 
         # W8
-        TestVm('tst-win8-64',               kfGrpStdSmoke,        sHd = '4.2/win8-64/t-win8-64-testmode.vdi',
+        TestVm('tst-win8-64',               kfGrpStdSmoke,        sHd = '4.2/win8-64/t-win8-64-active-admin-acc.vdi',
                sKind = 'Windows8_64', acCpusSup = range(1, 33), fIoApic = True),
         #TestVm('tst-win8-64-ich9',          kfGrpStdSmoke,         sHd = '4.2/win8-64/t-win8-64.vdi',

trunk/src/VBox/ValidationKit/tests/storage/remoteexecutor.py

@@ -301 +301 @@
     def rmTree(self, sDir, cMsTimeout = 30000):
         """
-        Recursively removes all files and sub directories including the given directory.
-        """
-        fRc = True;
-        if self.oTxsSession is not None:
+        Recursively removes all files and subdirectories including the given directory.
+        """
+        fRc = True;
+        if self.oTxsSession is not None:
+            reporter.log("rmTree (%s) using txs" % sDir);
             fRc = self.oTxsSession.syncRmTree(sDir, cMsTimeout);
         else:
             try:
-                shutil.rmtree(sDir, ignore_errors=True);
+                reporter.log("rmTree (%s) using shutil.rmtree function" % sDir);
+                shutil.rmtree(sDir);
             except:
                 fRc = False;