Changeset 72169 in vbox for trunk/src

Timestamp:

May 8, 2018 4:55:20 PM (7 years ago)

Author:

vboxsync

Message:

Validation Kit/Guest Control: disable a pushy test which can fill up the guest's disk, and make the "copy some random directory of the host" tests specific to Windows hosts use the right directory even if the OS isn't in C:\Windows.

File:

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

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

@@ -3160 +3160 @@
                 [ tdTestCopyTo(sUser = sUser, sPassword = sPassword, sSrc = ''),
                   tdTestResult(fRc = False) ],
-                [ tdTestCopyTo(sUser = sUser, sPassword = sPassword, sSrc = 'C:\\Windows',
+                [ tdTestCopyTo(sUser = sUser, sPassword = sPassword, sSrc = '/placeholder',
                                aFlags = [ 80 ] ),
                   tdTestResult(fRc = False) ],
@@ -3166 +3166 @@
                 [ tdTestCopyTo(sUser = sUser, sPassword = sPassword, sDst = ''),
                   tdTestResult(fRc = False) ],
-                [ tdTestCopyTo(sUser = sUser, sPassword = sPassword, sDst = 'C:\\Windows',
+                [ tdTestCopyTo(sUser = sUser, sPassword = sPassword, sDst = '/placeholder',
                                aFlags = [ 80 ] ),
                   tdTestResult(fRc = False) ],
@@ -3221 +3221 @@
                 ]);
 
-                if oTestVm.isWindows():
-                    aaTests.extend([
-                        # Copy the same file over to the guest, but this time store the file into the former
-                        # file's ADS (Alternate Data Stream). Only works on Windows, of course.
-                        [ tdTestCopyTo(sUser = sUser, sPassword = sPassword, sSrc = sVBoxValidationKitISO,
-                                       sDst = os.path.join(sScratchGst, 'HostGuestAdditions.iso:ADS-Test')),
-                          tdTestResult(fRc = True) ]
-                    ]);
+                aaTests.extend([
+                    # Copy the same file over to the guest, but this time store the file into the former
+                    # file's ADS (Alternate Data Stream). Only works on Windows, of course.
+                    [ tdTestCopyTo(sUser = sUser, sPassword = sPassword, sSrc = sVBoxValidationKitISO,
+                                   sDst = os.path.join(sScratchGst, 'HostGuestAdditions.iso:ADS-Test')),
+                      tdTestResult(fRc = True) ]
+                ]);
 
             #
@@ -3235 +3234 @@
             if self.oTstDrv.fpApiVer > 5.2: # Copying directories via Main is supported only in versions > 5.2.
                 if self.oTstDrv.sHost == "win":
+                    sSystemRoot = os.getenv('SystemRoot', 'C:\\Windows')
                     aaTests.extend([
                         # Copying directories with contain files we don't have read access to.
-                        [ tdTestCopyTo(sUser = sUser, sPassword = sPassword, sSrc = 'C:\\Windows\\security',
-                                       sDst = sScratchGst, aFlags = [ vboxcon.DirectoryCopyFlag_CopyIntoExisting ]),
-                          tdTestResult(fRc = False) ],
+                        ## @todo r=klaus disabled, because this can fill up the guest disk, making other tests fail,
+                        ## additionally it's not really clear if this fails reliably on all Windows versions, even
+                        ## the old ones like XP with a "proper" administrator.
+                        #[ tdTestCopyTo(sUser = sUser, sPassword = sPassword, sSrc = os.path.join(sSystemRoot, 'security',
+                        #               sDst = sScratchGst, aFlags = [ vboxcon.DirectoryCopyFlag_CopyIntoExisting ]),
+                        #  tdTestResult(fRc = False) ],
                         # Copying directories with regular files.
-                        [ tdTestCopyTo(sUser = sUser, sPassword = sPassword, sSrc = 'C:\\Windows\\Help',
+                        [ tdTestCopyTo(sUser = sUser, sPassword = sPassword, sSrc = os.path.join(sSystemRoot, 'Help',
                                        sDst = sScratchGst, aFlags = [ vboxcon.DirectoryCopyFlag_CopyIntoExisting ]),
                           tdTestResult(fRc = True) ]