Changeset 97565 in vbox for trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py

Timestamp:

Nov 16, 2022 10:20:06 AM (2 years ago)

Author:

vboxsync

Message:

Validation Kit/Guest Control: Make sure (test) if the test VM's (guessed) path separator matches the (known) Guest Control guest path separator + use it for guest destination paths.

File:

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

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

@@ -144 +144 @@
 
         try:
-            self.oGuest = oSession.o.console.guest;
+            self.oGuest  = oSession.o.console.guest;
+            self.oTestVm = oTestVm;
         except:
             reporter.errorXcpt();
@@ -150 +151 @@
         if self.oCreds is None:
             self.oCreds = tdCtxCreds();
-        self.oCreds.applyDefaultsIfNotSet(oTestVm);
+        self.oCreds.applyDefaultsIfNotSet(self.oTestVm);
 
         return True;
@@ -217 +218 @@
                         return (False, None);
                     reporter.log('Session "%s" successfully started' % (sName,));
+
+                    #
+                    # Make sure that the test VM configuration and Guest Control use the same path separator style for the guest.
+                    #
+                    sGstSep = '\\' if self.oGuestSession.pathStyle is vboxcon.PathStyle_DOS else '/';
+                    if self.oTestVm.pathSep() != sGstSep:
+                        reporter.error('Configured test VM uses a different path style (%s) than Guest Control (%s)' \
+                                       % (self.oTestVm.pathSep(), sGstSep));
                     break;
                 except:
@@ -4850 +4859 @@
             atTests.extend([
                 # Should succeed, as the file isn't there yet on the destination.
-                [ tdTestCopyToFile(sSrc = sBigFileHst,   sDst = sScratchGst + os.path.sep), tdTestResultSuccess() ],
+                [ tdTestCopyToFile(sSrc = sBigFileHst,   sDst = sScratchGst + oTestVm.pathSep()), tdTestResultSuccess() ],
                 # Overwrite the existing file.
-                [ tdTestCopyToFile(sSrc = sBigFileHst,   sDst = sScratchGst + os.path.sep), tdTestResultSuccess() ],
+                [ tdTestCopyToFile(sSrc = sBigFileHst,   sDst = sScratchGst + oTestVm.pathSep()), tdTestResultSuccess() ],
                 # Same file, but with a different name on the destination.
                 [ tdTestCopyToFile(sSrc = sEmptyFileHst, sDst = oTestVm.pathJoin(sScratchGst, os.path.split(sBigFileHst)[1])),
@@ -4884 +4893 @@
                 # With a trailing slash added to the destination, copy the empty guest directory
                 # (should end up as sScratchDstDir2Gst/empty):
-                [ tdTestCopyToDir(sSrc = sScratchEmptyDirHst, sDst = sScratchDstDir2Gst + os.path.sep), tdTestResultSuccess() ],
+                [ tdTestCopyToDir(sSrc = sScratchEmptyDirHst, sDst = sScratchDstDir2Gst + oTestVm.pathSep()),
+                  tdTestResultSuccess() ],
                 # Repeat -- this time it should fail, as the destination directory already exists (and
                 # DirectoryCopyFlag_CopyIntoExisting is not specified):
-                [ tdTestCopyToDir(sSrc = sScratchEmptyDirHst, sDst = sScratchDstDir2Gst + os.path.sep), tdTestResultFailure() ],
+                [ tdTestCopyToDir(sSrc = sScratchEmptyDirHst, sDst = sScratchDstDir2Gst + oTestVm.pathSep()),
+                  tdTestResultFailure() ],
                 # Add the DirectoryCopyFlag_CopyIntoExisting flag being set and it should work (again).
-                [ tdTestCopyToDir(sSrc = sScratchEmptyDirHst, sDst = sScratchDstDir2Gst + os.path.sep,
+                [ tdTestCopyToDir(sSrc = sScratchEmptyDirHst, sDst = sScratchDstDir2Gst + oTestVm.pathSep(),
                                   afFlags = [ vboxcon.DirectoryCopyFlag_CopyIntoExisting, ]), tdTestResultSuccess() ],
                 # Copy with a different destination name just for the heck of it:
@@ -4905 +4916 @@
             atTests.extend([
                 # Copy the entire test tree:
-                [ tdTestCopyToDir(sSrc = sScratchTreeDirHst, sDst = sScratchDstDir4Gst + os.path.sep), tdTestResultSuccess() ],
+                [ tdTestCopyToDir(sSrc = sScratchTreeDirHst, sDst = sScratchDstDir4Gst + oTestVm.pathSep()), tdTestResultSuccess() ],
                 # Again, should fail this time.
-                [ tdTestCopyToDir(sSrc = sScratchTreeDirHst, sDst = sScratchDstDir4Gst + os.path.sep), tdTestResultFailure() ],
+                [ tdTestCopyToDir(sSrc = sScratchTreeDirHst, sDst = sScratchDstDir4Gst + oTestVm.pathSep()), tdTestResultFailure() ],
                 # Works again, as DirectoryCopyFlag_CopyIntoExisting is specified.
-                [ tdTestCopyToDir(sSrc = sScratchTreeDirHst, sDst = sScratchDstDir4Gst + os.path.sep,
+                [ tdTestCopyToDir(sSrc = sScratchTreeDirHst, sDst = sScratchDstDir4Gst + oTestVm.pathSep(),
                                   afFlags = [ vboxcon.DirectoryCopyFlag_CopyIntoExisting, ]), tdTestResultSuccess() ],
             ]);