Changeset 98596 in vbox for trunk/src/VBox/ValidationKit/tests/additions

Timestamp:

Feb 15, 2023 10:58:00 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

155882

Message:

ValKit/tdAdd*.py: There is no reg.exe on W2K either. Skip shared folders for NT4 and NT3x.

Location:

trunk/src/VBox/ValidationKit/tests/additions

Files:

• tdAddBasic1.py (modified) (2 diffs)
• tdAddGuestCtrl.py (modified) (1 diff)
• tdAddSharedFolders1.py (modified) (1 diff)

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

@@ -340 +340 @@
         """ Sets a system-wide environment variable on the guest. Only supports Windows guests so far. """
         _ = oSession;
-        if oTestVm.sKind not in ('WindowsNT4',):
+        if oTestVm.sKind not in ('WindowsNT4', 'Windows2000',):
             sPathRegExe   = oTestVm.pathJoin(self.getGuestSystemDir(oTestVm), 'reg.exe');
             self.txsRunTest(oTxsSession, ('Set env var \"%s\"' % (sName,)),
@@ -398 +398 @@
         ## @todo !!! HACK ALERT !!! Add the value directly into the testing source image. Later.
         fHaveSetupApiDevLog = False;
-        if oTestVm.sKind not in ('WindowsNT4',):
+        if oTestVm.sKind not in ('WindowsNT4', 'Windows2000',):
             sRegExe = oTestVm.pathJoin(self.getGuestSystemDir(oTestVm), 'reg.exe');
             fHaveSetupApiDevLog = self.txsRunTest(oTxsSession, 'Enabling setupapi.dev.log', 30 * 1000,

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

@@ -1711 +1711 @@
 
             fRestartVBoxService = False;
-            if oTestVm.isWindows():
+            if oTestVm.isWindows() and oTestVm.sKind not in ('WindowsNT4', 'Windows2000',):
                 sPathRegExe         = oTestVm.pathJoin(self.oTstDrv.getGuestSystemDir(oTestVm), 'reg.exe');
                 sImagePath          = '%s -vvvv --logfile %s' % (self.sPathVBoxServiceExeGst, sPathLogFile);

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

@@ -201 +201 @@
 
         #
-        # Skip the test if before 6.0
+        # Skip the test if before 6.0 or if the VM is NT4 or older.
         #
         if self.oTstDrv.fpApiVer < 6.0:
             reporter.log('Requires 6.0 or later (for now)');
+            return (None, oTxsSession);
+        if oTestVm.isWindows() and oTestVm.sKind in ('WindowsNT3x', 'WindowsNT4', 'Windows2000',):
+            reporter.log('No shared folders on %s' % (oTestVm.sKind,));
             return (None, oTxsSession);