Changeset 102945 in vbox

Timestamp:

Jan 18, 2024 10:16:13 AM (14 months ago)

Author:

vboxsync

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

161173

Message:

Guest Control/Validation Kit: Try to fix execution tests on NT4 guests. See comment for details.

File:

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

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

@@ -3181 +3181 @@
         atExec = [];
         if oTestVm.isWindows() or oTestVm.isOS2():
+            if oTestVm.sKind is 'WindowsNT4':
+                # For whatever reason NT4 SP6 (tst-nt4sp6) returns exit code 2 for existing *and* non-existing files.
+                # I've manually checked that on the VM itself, so this is *not* a bug in the Guest Control code.
+                # So we have to tweak the expected exit codes here in order to make the following tests pass.
+                iExitCodeForExistingFiles    = 2
+                iExitCodeForNonExistingFiles = 2
+            else:
+                iExitCodeForExistingFiles    = 0
+                iExitCodeForNonExistingFiles = 1
             atExec += [
                 # Basic execution.
@@ -3186 +3195 @@
                   tdTestResultExec(fRc = True) ],
                 [ tdTestExec(sCmd = sImageOut, asArgs = [ sImageOut, '/C', 'dir', '/S', sFileForReading ]),
-                  tdTestResultExec(fRc = True) ],
+                  tdTestResultExec(fRc = True, iExitCode = iExitCodeForExistingFiles) ],
                 [ tdTestExec(sCmd = sImageOut, asArgs = [ sImageOut, '/C', 'dir', '/S', sSystemDir + '\\nonexist.dll' ]),
-                  tdTestResultExec(fRc = True, iExitCode = 1) ],
+                  tdTestResultExec(fRc = True, iExitCode = iExitCodeForNonExistingFiles) ],
                 [ tdTestExec(sCmd = sImageOut, asArgs = [ sImageOut, '/C', 'dir', '/S', '/wrongparam' ]),
                   tdTestResultExec(fRc = True, iExitCode = 1) ],
@@ -3197 +3206 @@
                   tdTestResultExec(fRc = True) ],
                 [ tdTestExec(sCmd = sImageOut, asArgs = [ sImageOut, '/C', 'dir', '/S', 'stdout-non-existing' ]),
-                  tdTestResultExec(fRc = True, iExitCode = 1) ],
+                  tdTestResultExec(fRc = True, iExitCode = iExitCodeForNonExistingFiles) ],
                 # StdErr.
                 [ tdTestExec(sCmd = sImageOut, asArgs = [ sImageOut, '/C', 'dir', '/S', sSystemDir ]),
                   tdTestResultExec(fRc = True) ],
                 [ tdTestExec(sCmd = sImageOut, asArgs = [ sImageOut, '/C', 'dir', '/S', 'stderr-non-existing' ]),
-                  tdTestResultExec(fRc = True, iExitCode = 1) ],
+                  tdTestResultExec(fRc = True, iExitCode = iExitCodeForNonExistingFiles) ],
                 # StdOut + StdErr.
                 [ tdTestExec(sCmd = sImageOut, asArgs = [ sImageOut, '/C', 'dir', '/S', sSystemDir ]),
                   tdTestResultExec(fRc = True) ],
                 [ tdTestExec(sCmd = sImageOut, asArgs = [ sImageOut, '/C', 'dir', '/S', 'stdouterr-non-existing' ]),
-                  tdTestResultExec(fRc = True, iExitCode = 1) ],
+                  tdTestResultExec(fRc = True, iExitCode = iExitCodeForNonExistingFiles) ],
             ];