Changeset 70521 in vbox for trunk/src/VBox/ValidationKit/tests/storage

Timestamp:

Jan 10, 2018 3:49:10 PM (7 years ago)

Author:

vboxsync

Message:

ValidationKit: More python 3 adjustments.

Location:

trunk/src/VBox/ValidationKit/tests/storage

Files:

• remoteexecutor.py (modified) (1 diff)
• storagecfg.py (modified) (3 diffs)
• tdStorageBenchmark1.py (modified) (2 diffs)

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

@@ -246 +246 @@
         return sFileId;
 
-    def mkDir(self, sDir, fMode = 0700, cMsTimeout = 30000):
+    def mkDir(self, sDir, fMode = 0o700, cMsTimeout = 30000):
         """
         Creates a new directory at the given location.

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

@@ -319 +319 @@
                 sFdiskScript = ';\n'; # Single partition filling everything
                 if cbVol is not None:
-                    sFdiskScript = ',' + str(cbVol / 512) + '\n'; # Get number of sectors
+                    sFdiskScript = ',' + str(cbVol // 512) + '\n'; # Get number of sectors
                 fRc = oExec.execBinaryNoStdOut('sfdisk', ('--no-reread', '--wipe', 'always', '-q', '-f', sDiskPath), \
                                                sFdiskScript);
@@ -430 +430 @@
         if fRc:
             self.oStorOs = oStorOs;
-            if isinstance(oDiskCfg, basestring):
+            if utils.isString(oDiskCfg):
                 self.lstDisks = oStorOs.getDisksMatchingRegExp(oDiskCfg);
             else:
@@ -591 +591 @@
         return fRc;
 
-    def mkDirOnVolume(self, sMountPoint, sDir, fMode = 0700):
+    def mkDirOnVolume(self, sMountPoint, sDir, fMode = 0o700):
         """
         Creates a new directory on the volume pointed to by the given mount point.

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

@@ -1068 +1068 @@
                 if sMountPoint is not None:
                     # Create a directory where every normal user can write to.
-                    self.oStorCfg.mkDirOnVolume(sMountPoint, 'test', 0777);
+                    self.oStorCfg.mkDirOnVolume(sMountPoint, 'test', 0o777);
                     sDiskPath = sMountPoint + '/test';
                 else:
@@ -1312 +1312 @@
                         reporter.testFailure('Failed to prepare host storage');
                         fRc = False;
-                    self.oStorCfg.mkDirOnVolume(sMountPoint, 'test', 0777);
+                    self.oStorCfg.mkDirOnVolume(sMountPoint, 'test', 0o777);
                     sMountPoint = sMountPoint + '/test';
                     reporter.testDone();