Changeset 83734 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Apr 17, 2020 7:36:20 AM (5 years ago)

Author:

vboxsync

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

137252

Message:

Validation Kit/Shared Folders: Added first testing for auto-unmounting.

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddSharedFolders1.py (modified) (7 diffs)

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

@@ -64 +64 @@
             'E:/vboxvalidationkit/${OS/ARCH}/FsPerf${EXESUFF}',
         ];
+        self.sGuestSlash = '';
 
     def parseOption(self, asArgs, iArg):
@@ -94 +95 @@
         return True;
 
+    def mountShareEx(self, oSession, oTxsSession, sShareName, sHostPath, sGuestMountPoint, fMustSucceed):
+        """
+        Automount a shared folder in the guest, extended version.
+
+        Returns success status, based on fMustSucceed.
+        """
+        reporter.testStart('Automounting "%s"' % (sShareName,));
+
+        reporter.log2('Creating shared folder "%s" at "%s" ...' % (sShareName, sGuestMountPoint));
+        try:
+            oConsole = oSession.o.console;
+            oConsole.createSharedFolder(sShareName, sHostPath, True, True, sGuestMountPoint);
+        except:
+            if fMustSucceed:
+                reporter.errorXcpt('createSharedFolder(%s,%s,True,True,%s)' % (sShareName, sHostPath, sGuestMountPoint));
+            else:
+                reporter.log('createSharedFolder(%s,%s,True,True,%s) failed, good' % (sShareName, sHostPath, sGuestMountPoint));
+            reporter.testDone();
+            return False is fMustSucceed;
+
+        # Check whether we can see the shared folder now.  Retry for 30 seconds.
+        msStart = base.timestampMilli();
+        while True:
+            fRc = oTxsSession.syncIsDir(sGuestMountPoint + self.sGuestSlash + 'candle.dir');
+            reporter.log2('candle.dir check -> %s' % (fRc,));
+            if fRc is fMustSucceed:
+                break;
+            if base.timestampMilli() - msStart > 10 * 90000:
+                reporter.error('Shared folder mounting timed out!');
+                break;
+            self.oTstDrv.sleep(1);
+
+        reporter.testDone();
+
+        return fRc == fMustSucceed;
+
+    def mountShare(self, oSession, oTxsSession, sShareName, sHostPath, sGuestMountPoint):
+        """
+        Automount a shared folder in the guest.
+
+        Returns success status.
+        """
+        return self.mountShareEx(oSession, oTxsSession, sShareName, sHostPath, sGuestMountPoint, fMustSucceed = True);
+
+    def unmountShareEx(self, oSession, oTxsSession, sShareName, sGuestMountPoint, fMustSucceed):
+        """
+        Unmounts a shared folder in the guest.
+
+        Returns success status, based on fMustSucceed.
+        """
+        reporter.log2('Autounmount');
+        try:
+            oConsole = oSession.o.console;
+            oConsole.removeSharedFolder(sShareName);
+        except:
+            if fMustSucceed:
+                reporter.errorXcpt('removeSharedFolder(%s)' % (sShareName,));
+            else:
+                reporter.log('removeSharedFolder(%s)' % (sShareName,));
+            reporter.testDone();
+            return False is fMustSucceed;
+
+        # Check whether the shared folder is gone on the guest now.  Retry for 30 seconds.
+        msStart = base.timestampMilli();
+        while True:
+            fRc2 = oTxsSession.syncIsDir(sGuestMountPoint + self.sGuestSlash + 'candle.dir');
+            reporter.log2('candle.dir check -> %s' % (fRc2,));
+            if fRc2 is not fMustSucceed:
+                break;
+            if base.timestampMilli() - msStart > 10 * 90000:
+                reporter.error('Shared folder unmounting timed out!');
+                fRc = False;
+                break;
+            self.oTstDrv.sleep(1);
+
+        reporter.testDone();
+
+        return fRc is fMustSucceed;
+
+    def unmountShare(self, oSession, oTxsSession, sShareName, sGuestMountPoint):
+        """
+        Unmounts a shared folder in the guest, extended version.
+
+        Returns success status, based on fMustSucceed.
+        """
+        return self.unmountShareEx(oSession, oTxsSession, sShareName, sGuestMountPoint, fMustSucceed = True);
+
     def testIt(self, oTestVm, oSession, oTxsSession):
         """
@@ -109 +197 @@
             return (None, oTxsSession);
 
+        # Guess a free mount point inside the guest.
+        if oTestVm.isWindows() or oTestVm.isOS2():
+            self.sGuestSlash  = '\\';
+        else:
+            self.sGuestSlash  = '/';
+
         #
         # Create the host directory to share. Empty except for a 'candle.dir' subdir
         # that we use to check that it mounted correctly.
         #
-        sSharedFolder1 = os.path.join(self.oTstDrv.sScratchPath, 'shfl1');
-        reporter.log2('Creating shared host folder "%s"...' % (sSharedFolder1,));
-        if os.path.exists(sSharedFolder1):
-            try:    shutil.rmtree(sSharedFolder1);
-            except: return (reporter.errorXcpt('shutil.rmtree(%s)' % (sSharedFolder1,)), oTxsSession);
-        try:    os.mkdir(sSharedFolder1);
-        except: return (reporter.errorXcpt('os.mkdir(%s)' % (sSharedFolder1,)), oTxsSession);
-        try:    os.mkdir(os.path.join(sSharedFolder1, 'candle.dir'));
-        except: return (reporter.errorXcpt('os.mkdir(%s)' % (sSharedFolder1,)), oTxsSession);
+        sShareName1     = 'shfl1';
+        sShareHostPath1 = os.path.join(self.oTstDrv.sScratchPath, sShareName1);
+        reporter.log2('Creating shared host folder "%s"...' % (sShareHostPath1,));
+        if os.path.exists(sShareHostPath1):
+            try:    shutil.rmtree(sShareHostPath1);
+            except: return (reporter.errorXcpt('shutil.rmtree(%s)' % (sShareHostPath1,)), oTxsSession);
+        try:    os.mkdir(sShareHostPath1);
+        except: return (reporter.errorXcpt('os.mkdir(%s)' % (sShareHostPath1,)), oTxsSession);
+        try:    os.mkdir(os.path.join(sShareHostPath1, 'candle.dir'));
+        except: return (reporter.errorXcpt('os.mkdir(%s)' % (sShareHostPath1,)), oTxsSession);
 
         # Guess a free mount point inside the guest.
         if oTestVm.isWindows() or oTestVm.isOS2():
             sMountPoint1 = 'V:';
-            sGuestSlash  = '\\';
         else:
-            sMountPoint1 = '/mnt/shfl1';
-            sGuestSlash  = '/';
-
-        #
-        # Automount a shared folder in the guest.
-        #
-        reporter.testStart('Automount');
-
-        reporter.log2('Creating shared folder shfl1...');
-        try:
-            oConsole = oSession.o.console;
-            oConsole.createSharedFolder('shfl1', sSharedFolder1, True, True, sMountPoint1);
-        except:
-            reporter.errorXcpt('createSharedFolder(shfl1,%s,True,True,%s)' % (sSharedFolder1,sMountPoint1));
-            reporter.testDone();
-            return (False, oTxsSession);
-
-        # Check whether we can see the shared folder now.  Retry for 30 seconds.
-        msStart = base.timestampMilli();
-        while True:
-            fRc = oTxsSession.syncIsDir(sMountPoint1 + sGuestSlash + 'candle.dir');
-            reporter.log2('candle.dir check -> %s' % (fRc,));
-            if fRc is not False:
-                break;
-            if base.timestampMilli() - msStart > 30000:
-                reporter.error('Shared folder mounting timed out!');
-                break;
-            self.oTstDrv.sleep(1);
-
-        reporter.testDone();
+            sMountPoint1 = '/mnt/' + sShareName1;
+
+        fRc = self.mountShare(oSession, oTxsSession, sShareName1, sShareHostPath1, sMountPoint1);
         if fRc is not True:
             return (False, oTxsSession); # skip the remainder if we cannot auto mount the folder.
@@ -166 +233 @@
         fSkip = 'fsperf' not in self.asTests;
         if fSkip is False:
-            cMbFree = utils.getDiskUsage(sSharedFolder1);
+            cMbFree = utils.getDiskUsage(sShareHostPath1);
             if cMbFree >= 16:
                 reporter.log2('Free space: %u MBs' % (cMbFree,));
             else:
-                reporter.log('Skipping FsPerf because only %u MB free on %s' % (cMbFree, sSharedFolder1,));
+                reporter.log('Skipping FsPerf because only %u MB free on %s' % (cMbFree, sShareHostPath1,));
                 fSkip = True;
         if fSkip is False:
             # Common arguments:
-            asArgs = ['FsPerf', '-d', sMountPoint1 + sGuestSlash + 'fstestdir-1', '-s8'];
+            asArgs = ['FsPerf', '-d', sMountPoint1 + self.sGuestSlash + 'fstestdir-1', '-s8'];
 
             # Skip part of mmap on older windows systems without CcCoherencyFlushAndPurgeCache (>= w7).
@@ -217 +284 @@
             reporter.log2('FsPerf -> %s' % (fRc,));
 
-            sTestDir = os.path.join(sSharedFolder1, 'fstestdir-1');
+            sTestDir = os.path.join(sShareHostPath1, 'fstestdir-1');
             if os.path.exists(sTestDir):
                 fRc = reporter.errorXcpt('test directory lingers: %s' % (sTestDir,));
@@ -226 +293 @@
             reporter.testDone(fSkip or fRc is None);
 
+        #
+        # Check if auto-unmounting works.
+        #
+        if fRc is True:
+            fRc = self.unmountShare(oSession, oTxsSession, sShareName1, sMountPoint1);
+
+        ## @todo Add tests for multiple automount shares, random unmounting, reboot test.
+
         return (fRc, oTxsSession);
-
 
     def _locateGstFsPerf(self, oTxsSession):
@@ -244 +318 @@
     reporter.error('Cannot run standalone, use tdAddBasic1.py');
     sys.exit(1);
-