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

Timestamp:

Jun 9, 2020 7:11:22 AM (5 years ago)

Author:

vboxsync

Message:

Validation Kit/tdAddGuestCtrl.py: Refined long arguments testing a bit.

File:

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

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

@@ -1431 +1431 @@
         # The tests. Must-succeed tests should be first.
         atTests = [
-            ( True,  self.prepareGuestForDebugging,         None,               'Manaul Debugging',),
+            ( True,  self.prepareGuestForDebugging,         None,               'Manual Debugging',),
             ( True,  self.prepareGuestForTesting,           None,               'Preparations',),
             ( True,  self.testGuestCtrlSession,             'session_basic',    'Session Basics',),
@@ -1494 +1494 @@
 
         if self.oDebug.sImgPath is None: # If no debugging enabled, bail out.
+            reporter.log('Skipping debugging');
             return True
 
@@ -2958 +2959 @@
         # Test very long arguments.
         # Old(er) Windows OSes tend to crash in cmd.exe, so skip this.
+        # Regarding paths:
+        # - We have RTPATH_BIG_MAX (64K)
+        # - MSDN says 32K for CreateFileW()
+        # - On Windows, each path component must not be longer than MAX_PATH (260), see
+        #   https://docs.microsoft.com/en-us/windows/win32/fileio/filesystem-functionality-comparison#limits
         if  self.oTstDrv.fpApiVer >= 6.1 \
         and oTestVm.sKind not in ('WindowsNT4', 'Windows2000', 'WindowsXP', 'Windows2003'):
+            sEndMarker = '--end-marker';
+            if oTestVm.isWindows() \
+            or oTestVm.isOS2():
+                sCmd   = sShell;
+            else:
+                sCmd   = oTestVm.pathJoin(self.oTstDrv.getGuestSystemDir(oTestVm), 'echo');
+
             for _ in xrange(0, 16):
-                sFileName = str(self.oTestFiles.generateFilenameEx(128 * 1024, 2048));
-                reporter.log2('sFileName=%s, type=%s' % (limitString(sFileName), type(sFileName)));
                 if oTestVm.isWindows() \
                 or oTestVm.isOS2():
-                    sCmd   = sShell;
-                    asArgs = [ sShell, sShellOpt, "echo", sFileName, "--end-marker" ];
+                    asArgs = [ sShell, sShellOpt, "echo" ];
                 else:
-                    sCmd   = oTestVm.pathJoin(self.oTstDrv.getGuestSystemDir(oTestVm), 'echo');
-                    asArgs = [ sCmd, sFileName, "--end-marker" ];
+                    asArgs = [ sCmd ];
+
+                # Append a random number of arguments with random length.
+                for _ in xrange(0, self.oTestFiles.oRandom.randrange(1, 16)):
+                    asArgs.append(self.oTestFiles.generateFilenameEx((16 * 1024) - len(str(sEndMarker)), 1));
+
+                asArgs.append(sEndMarker);
+
+                reporter.log2('asArgs=%s (%d args), type=%s' % (limitString(asArgs), len(asArgs), type(asArgs)));
+
                 ## @todo Check limits; on Ubuntu with 256KB IPRT returns VERR_NOT_IMPLEMENTED.
                 # Use a higher timeout (15 min) than usual for these long checks.