Changeset 78644 in vbox for trunk/src/VBox

Timestamp:

May 22, 2019 12:29:14 AM (6 years ago)

Author:

vboxsync

Message:

tdAddSharedFolders1.py: Shared folder testing is halfways working now... bugref:9172

Location:

trunk/src/VBox/ValidationKit/tests/additions

Files:

• Makefile.kmk (modified) (1 diff)
• tdAddBasic1.py (modified) (5 diffs)
• tdAddSharedFolders1.py (modified) (7 diffs)

trunk/src/VBox/ValidationKit/tests/additions/Makefile.kmk

@@ -34 +34 @@
 ValidationKitTestsAdditions_EXEC_SOURCES := \
         $(PATH_SUB_CURRENT)/tdAddBasic1.py \
-        $(PATH_SUB_CURRENT)/tdAddGuestCtrl.py
+        $(PATH_SUB_CURRENT)/tdAddGuestCtrl.py \
+        $(PATH_SUB_CURRENT)/tdAddSharedFolders1.py
 
 

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

@@ -35 +35 @@
 import os;
 import sys;
+import uuid;
 
 # Only the main script needs to modify the path.
@@ -51 +52 @@
 sys.path.append(os.path.dirname(os.path.abspath(__file__))); # For sub-test drivers.
 from tdAddGuestCtrl import SubTstDrvAddGuestCtrl;
-#from tdAddSharedFolders1 import SubTstDrvAddSharedFolders1;
+from tdAddSharedFolders1 import SubTstDrvAddSharedFolders1;
 
 
@@ -65 +66 @@
         vbox.TestDriver.__init__(self);
         self.oTestVmSet = self.oTestVmManager.getSmokeVmSet('nat');
-        self.asTestsDef = ['install', 'guestprops', 'stdguestprops', 'guestcontrol', 'sharedfolders'];
+        self.asTestsDef = ['install', 'guestprops', 'stdguestprops', 'guestcontrol', ]; #'sharedfolders'];
         self.asTests    = self.asTestsDef;
         self.asRsrcs    = None
 
         self.addSubTestDriver(SubTstDrvAddGuestCtrl(self));
-        #self.addSubTestDriver(SubTstDrvAddSharedFolders1(self));
+        self.addSubTestDriver(SubTstDrvAddSharedFolders1(self));
 
     #
@@ -117 +118 @@
         eNic0AttachType = vboxcon.NetworkAttachmentType_NAT;
         sGaIso = self.getGuestAdditionsIso();
+
+        # On 6.0 we merge the GAs with the ValidationKit so we can get at FsPerf.
+        # Note! Not possible to do a dboule import as both images an '/OS2' dir.
+        #       So, using same dir as with unattended VISOs for the valkit.
+        if self.fpApiVer >= 6.0 and 'sharedfolders' in self.asTests:
+            sGaViso = os.path.join(self.sScratchPath, 'AdditionsAndValKit.viso');
+            ## @todo encode as bash cmd line:
+            sVisoContent = '--iprt-iso-maker-file-marker-bourne-sh %s ' \
+                           '--import-iso \'%s\' ' \
+                           '--push-iso \'%s\' ' \
+                           '/vboxvalidationkit=/ ' \
+                           '--pop ' \
+                          % (uuid.uuid4(), sGaIso, self.sVBoxValidationKitIso);
+            reporter.log2('Using VISO combining GAs and ValKit "%s": %s' % (sGaViso, sVisoContent));
+            oGaViso = open(sGaViso, 'w');
+            oGaViso.write(sVisoContent);
+            oGaViso.close();
+            sGaIso = sGaViso;
+
         return self.oTestVmSet.actionConfig(self, eNic0AttachType = eNic0AttachType, sDvdImage = sGaIso);
 
@@ -164 +184 @@
             reporter.testDone(fSkip);
 
-            #fSkip = 'sharedfolders' not in self.asTests;
-            #reporter.testStart('Shared Folders');
-            #if not fSkip:
-            #    fRc, oTxsSession = self.aoSubTstDrvs[1].testIt(oTestVm, oSession, oTxsSession);
-            #reporter.testDone(fSkip or fRc is None);
+            fSkip = 'sharedfolders' not in self.asTests and self.fpApiVer >= 6.0;
+            reporter.testStart('Shared Folders');
+            if not fSkip:
+                fRc, oTxsSession = self.aoSubTstDrvs[1].testIt(oTestVm, oSession, oTxsSession);
+            reporter.testDone(fSkip or fRc is None);
 
             ## @todo Save and restore test.

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

@@ -3 +3 @@
 
 """
-VirtualBox Validation Kit - Shared Folders
+VirtualBox Validation Kit - Shared Folders #1.
 """
 
@@ -43 +43 @@
 from testdriver import reporter;
 from testdriver import base;
-from testdriver import vbox;
-from testdriver import vboxcon;
-from testdriver import vboxwrappers;
 from common     import utils;
-
-# Python 3 hacks:
-if sys.version_info[0] >= 3:
-    long = int      # pylint: disable=W0622,C0103
 
 
@@ -104 +97 @@
         #
         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);
@@ -125 +119 @@
         reporter.testStart('Automount');
 
+        reporter.log2('Creating shared folder shfl1...');
         try:
             oConsole = oSession.o.console;
@@ -137 +132 @@
         while True:
             fRc = oTxsSession.syncIsDir(sMountPoint1 + sGuestSlash + 'candle.dir');
+            reporter.log2('candle.dir check -> %s' % (fRc,));
             if fRc is not False:
                 break;
@@ -142 +138 @@
                 reporter.error('Shared folder mounting timed out!');
                 break;
-            oTstDrv.sleep(1);
+            self.oTstDrv.sleep(1);
 
         reporter.testDone();
-        if fRc is not None:
+        if fRc is not True:
             return (False, oTxsSession); # skip the remainder if we cannot auto mount the folder.
 
@@ -154 +150 @@
         fSkip = 'fsperf' not in self.asTests;
         if fSkip is False:
-            cMbFree = utils.getDiskUsage(sSharedFolders1);
-            if cMbFree < 16:
+            cMbFree = utils.getDiskUsage(sSharedFolder1);
+            if cMbFree >= 16:
+                reporter.log2('Free space: %u MBs' % (cMbFree,));
+            else:
                 reporter.log('Skipping FsPerf because only %u MB free on %s' % (cMbFree, sSharedFolder1,));
                 fSkip = True;
         if fSkip is False:
-            asArgs = ['FsPerf', '-d', sMountPoint1 + sGuestSlash + 'fstestdir-1', ];
-            if oTestVm.sGuestOsType in []:
-                asArgs.append('--no-mmap'); # Fails on older than win7 (CcCoherencyFlushAndPurgeCache).
-            fRc = oTstDrv.txsRunTest(oTxsSession, 'FsPerf', 10 * 60 * 1000, '${CDROM}/${OS/ARCH}/FsPerf${EXESUFF}', asArgs);
+            # Common arguments:
+            asArgs = ['FsPerf', '-d', sMountPoint1 + sGuestSlash + 'fstestdir-1', '-m200'];
+
+            # Skip mmap on older windows systems without CcCoherencyFlushAndPurgeCache (>= w7).
+            reporter.log2('oTestVm.sGuestOsType=%s' % (oTestVm.sGuestOsType,));
+            if oTestVm.sGuestOsType in [ 'WindowsNT3x', 'WindowsNT4', 'Windows2000', 'WindowsXP', 'WindowsXP_64',
+                                         'Windows2003', 'Windows2003_64', 'WindowsVista', 'WindowsVista_64',
+                                         'Windows2008', 'Windows2008_64']:
+                asArgs.append('--no-mmap');
+
+            # Configure I/O block sizes according to guest memory size:
+            cbMbRam = 128;
+            try:    cbMbRam = oSession.o.machine.memorySize;
+            except: reporter.errorXcpt();
+            reporter.log2('cbMbRam=%s' % (cbMbRam,));
+            asArgs.append('--set-block-size=1');
+            asArgs.append('--add-block-size=512');
+            asArgs.append('--add-block-size=4096');
+            asArgs.append('--add-block-size=16384');
+            asArgs.append('--add-block-size=65536');
+            asArgs.append('--add-block-size=1048576');       #   1 MiB
+            if cbMbRam >= 512:
+                asArgs.append('--add-block-size=33554432');  #  32 MiB
+            if cbMbRam >= 768:
+                asArgs.append('--add-block-size=134217728'); # 128 MiB
+
+            reporter.log2('Starting guest FsPerf (%s)...' % (asArgs,));
+            fRc = self.oTstDrv.txsRunTest(oTxsSession, 'FsPerf', 10 * 60 * 1000,
+                                          '${CDROM}/vboxvalidationkit/${OS/ARCH}/FsPerf${EXESUFF}', asArgs);
+            reporter.log2('FsPerf -> %s' % (fRc,));
 
             sTestDir = os.path.join(sSharedFolder1, 'fstestdir-1');