Changeset 72081 in vbox for trunk/src/VBox

Timestamp:

May 2, 2018 12:19:55 PM (7 years ago)

Author:

vboxsync

Message:

Guest Control/Validation Kit: Try to fix the failing tests.

File:

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

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

@@ -3120 +3120 @@
         if oTestVm.isWindows():
             sUser = "Administrator";
-            sScratchGst = "C:\\Temp\\vboxtest\\testGuestCtrlCopyTo/";
+            sScratchGst = "C:\\Temp\\vboxtest\\testGuestCtrlCopyTo\\";
             sScratchGstNotExist = "C:\\does-not-exist\\";
             sScratchGstInvalid = "?*|invalid-name?*|";
@@ -3306 +3306 @@
         sPassword = "password";
 
+        sScratchHst = os.path.join(self.oTstDrv.sScratchPath, "testGctrlCopyFrom");
+
         if self.oTstDrv.sHost == "win":
-            sScratchHstInvalid = "?*|invalid-name?*|";
+            sScratchHstNotExist = sScratchHst + "\\does-not-exist\\";
+            sScratchHstInvalid  = "?*|invalid-name?*|";
         else:
-            sScratchHstInvalid = "/";
-
-        sScratchHst = os.path.join(self.oTstDrv.sScratchPath, "testGctrlCopyFrom");
+            sScratchHstNotExist = sScratchHst + "/does-not-exist/";
+            sScratchHstInvalid  = "/";
+
         try:
             os.makedirs(sScratchHst);
@@ -3386 +3389 @@
                     # Destination is a non-existing directory.
                     [ tdTestCopyFrom(sUser = sUser, sPassword = sPassword, sSrc = 'C:\\Windows\\system32\\ole32.dll',
-                                     sDst = sScratchHst + "/non-existing-directory/"),
+                                     sDst = sScratchHstNotExist),
                       tdTestResult(fRc = False) ]
                 ]);
@@ -3414 +3417 @@
                     # Copying contents of directories into a non-existing directory chain on the host which fail.
                     [ tdTestCopyFrom(sUser = sUser, sPassword = sPassword, sSrc = 'C:\\Windows\\Web\\',
-                                     sDst = sScratchHst + "/not/existing/",
+                                     sDst = sScratchHstNotExist,
                                      aFlags = [ vboxcon.DirectoryCopyFlag_CopyIntoExisting ]),
                       tdTestResult(fRc = False) ],
                     # Copying contents of directories into a non-existing directory on the host, which should succeed.
                     [ tdTestCopyFrom(sUser = sUser, sPassword = sPassword, sSrc = 'C:\\Windows\\Web\\',
-                                     sDst = sScratchHst + "/no-existing/",
+                                     sDst = sScratchHstNotExist,
                                      aFlags = [ vboxcon.DirectoryCopyFlag_CopyIntoExisting ]),
                       tdTestResult(fRc = True) ]