Changeset 92822 in vbox for trunk/src/VBox/ValidationKit/tests

Timestamp:

Dec 8, 2021 2:55:45 PM (3 years ago)

Author:

vboxsync

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

148744

Message:

Guest Control: Resolved a @todo: Implemented DirectoryCopyFlag_Recursive + DirectoryCopyFlag_FollowLinks and no longer do this implicitly internally.

File:

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

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

@@ -1841 +1841 @@
         reporter.log2('Copying guest dir "%s" to host "%s"' % (limitString(oTest.sSrc), limitString(oTest.sDst)));
         try:
+            if self.oTstDrv.fpApiVer >= 7.0:
+                ## @todo Make the following new flags implicit for 7.0 for now. Develop dedicated tests for this later and remove.
+                if vboxcon.DirectoryCopyFlag_Recursive not in oTest.afFlags:
+                    oTest.afFlags.extend([ vboxcon.DirectoryCopyFlag_Recursive ]);
+                ## @todo Ditto.
+                if vboxcon.DirectoryCopyFlag_FollowLinks not in oTest.afFlags:
+                    oTest.afFlags.extend([ vboxcon.DirectoryCopyFlag_FollowLinks ]);
             oCurProgress = oGuestSession.directoryCopyFromGuest(oTest.sSrc, oTest.sDst, oTest.afFlags);
         except:
@@ -1898 +1905 @@
     def gctrlCopyDirTo(self, oGuestSession, sSrc, sDst, afFlags, fIsError):
         """
-        Helper function to copy a directory tree from the host to the guest.
+        Helper function to copy a directory (tree) from the host to the guest.
         """
         reporter.log2('Copying host directory "%s" to guest "%s" (flags %s)' % (limitString(sSrc), limitString(sDst), afFlags));
         try:
+            if self.oTstDrv.fpApiVer >= 7.0:
+                ## @todo Make the following new flags implicit for 7.0 for now. Develop dedicated tests for this later and remove.
+                if vboxcon.DirectoryCopyFlag_Recursive not in afFlags:
+                    afFlags.extend([ vboxcon.DirectoryCopyFlag_Recursive ]);
+                ## @todo Ditto.
+                if vboxcon.DirectoryCopyFlag_FollowLinks not in afFlags:
+                    afFlags.extend([ vboxcon.DirectoryCopyFlag_FollowLinks ]);
             oCurProgress = oGuestSession.directoryCopyToGuest(sSrc, sDst, afFlags);
         except: