Changeset 62123 in vbox for trunk

Timestamp:

Jul 7, 2016 7:13:36 PM (9 years ago)

Author:

vboxsync

Message:

ValidationKit/tests/storage: Fixes

Location:

trunk/src/VBox/ValidationKit/tests/storage

Files:

• remoteexecutor.py (modified) (3 diffs)
• tdStorageBenchmark1.py (modified) (6 diffs)

trunk/src/VBox/ValidationKit/tests/storage/remoteexecutor.py

@@ -34 +34 @@
 import os;
 import shutil;
+import StringIO
 import subprocess;
 
@@ -44 +45 @@
 
     def __init__(self, sInput = None):
+        self.sInput = StringIO.StringIO();
         if sInput is not None:
-            self.sInput = self._toString(sInput);
-        else:
-            self.sInput = '';
-        self.offInput = 0;
+            self.sInput.write(self._toString(sInput));
         self.sOutput  = '';
 
@@ -66 +65 @@
     def read(self, cb):
         """file.read"""
-        cb = min(cb, len(self.sInput) - self.offInput);
-        if cb > 0:
-            sReturn = self.sInput[self.offInput:(self.offInput + cb)];
-            self.offInput += cb;
-        else:
-            sReturn = '';
-        return sReturn;
+        return self.sInput.read(cb);
 
     def write(self, sText):

trunk/src/VBox/ValidationKit/tests/storage/tdStorageBenchmark1.py

@@ -258 +258 @@
         self.asIscsiTargets    = self.asIscsiTargetsDef;
         self.fTestHost         = False;
+        self.fUseScratch       = False;
         self.oStorCfg          = None;
 
@@ -288 +289 @@
         reporter.log('      Do all configured tests on the host first and report the results');
         reporter.log('      to get a baseline');
+        reporter.log('  --use-scratch');
+        reporter.log('      Use the scratch directory for testing instead of setting up');
+        reporter.log('      fresh volumes on dedicated disks (for development)');
         return rc;
 
@@ -343 +347 @@
         elif asArgs[iArg] == '--test-host':
             self.fTestHost = True;
+        elif asArgs[iArg] == '--use-scratch':
+            self.fUseScratch = True;
         else:
             return vbox.TestDriver.parseOption(self, asArgs, iArg);
@@ -598 +604 @@
                     asPaths = self.asIscsiTargets;
                 else:
-                    # Create a new default storage config on the host
-                    sMountPoint = self.prepareStorage(self.oStorCfg);
-                    if sMountPoint is not None:
-                        asPaths = [ sMountPoint ];
+                    if self.fUseScratch:
+                        asPaths = [ self. sScratchPath ];
                     else:
-                        asPaths = [];
-                        fRc = False;
-                        reporter.testFailure('Failed to prepare storage for VM');
+                        # Create a new default storage config on the host
+                        sMountPoint = self.prepareStorage(self.oStorCfg);
+                        if sMountPoint is not None:
+                            # Create a directory where every normal user can write to.
+                            self.oStorCfg.mkDirOnVolume(sMountPoint, 'test', 0777);
+                            asPaths = [ sMountPoint + '/test' ];
+                        else:
+                            asPaths = [];
+                            fRc = False;
+                            reporter.testFailure('Failed to prepare storage for VM');
 
                 for sPath in asPaths:
@@ -613 +624 @@
                         sPath = sPath;
                     else:
-                         # Create a directory where every normal user can write to.
-                        self.oStorCfg.mkDirOnVolume(sPath, 'test', 0777);
-                        sPath = sPath + "/test/test.disk";
+                        sPath = sPath + "/test.disk";
 
                     for cCpus in self.acCpus:
@@ -660 +669 @@
             if self.fTestHost:
                 reporter.testStart('Host');
-                sMountPoint = self.prepareStorage(self.oStorCfg);
+                if self.fUseScratch:
+                    sMountpoint = self.sScratchPath;
+                else:
+                    sMountPoint = self.prepareStorage(self.oStorCfg);
                 if sMountPoint is not None:
                     fRc = self.testBenchmarks(utils.getHostOs(), sMountPoint, oExecutor);