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

Timestamp:

Mar 8, 2022 1:51:26 PM (3 years ago)

Author:

vboxsync

Message:

ValKit/utils.py,tests: Move crc32_of_file to common/utils.py as calcCrc32OfFile, no point in having two copies of it. pylint fixes.

Location:

trunk/src/VBox/ValidationKit/tests/storage

Files:

• tdStorageRawDrive1.py (modified) (4 diffs)
• tdStorageSnapshotMerging1.py (modified) (3 diffs)

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

@@ -31 +31 @@
 # Standard Python imports.
 import os;
+import re;
 import sys;
-import re;
-import zlib;
 
 # Only the main script needs to modify the path.
@@ -42 +41 @@
 
 # Validation Kit imports.
+from common     import utils;
 from testdriver import reporter;
 from testdriver import base;
@@ -49 +49 @@
 from testdriver import vboxwrappers;
 
-
-def crc32_of_file(filepath):
-    fileobj = open(filepath,'rb');
-    current = 0;
-
-    while True:
-        buf = fileobj.read(1024 * 1024);
-        if not buf:
-            break
-        current = zlib.crc32(buf, current);
-
-    fileobj.close();
-    return current % 2**32;
 
 class tdStorageRawDriveOs(vboxtestvms.BaseTestVm):
@@ -1212 +1199 @@
                                         reporter.error('Download vmdktest-pt.vmdk from guest to host failed');
                                     else:
-                                        uResCrc32 = crc32_of_file(sDstFile);
+                                        uResCrc32 = utils.calcCrc32OfFile(sDstFile);
                                         if uResCrc32 != action['data-crc'][sHdd]:
                                             fRc = reporter.error('vmdktest-pt.vmdk does not match what was expected');

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

@@ -43 +43 @@
 
 # Validation Kit imports.
+from common     import utils;
 from testdriver import reporter;
 from testdriver import base;
@@ -52 +53 @@
 if sys.version_info[0] >= 3:
     long = int;     # pylint: disable=redefined-builtin,invalid-name
-
-
-def crc32_of_file(filepath):
-    fileobj = open(filepath,'rb');
-    current = 0;
-
-    while True:
-        buf = fileobj.read(1024 * 1024);
-        if not buf:
-            break
-        current = zlib.crc32(buf, current);
-
-    fileobj.close();
-    return current % 2**32;
 
 
@@ -349 +336 @@
                     uResCrc32 = long(0);
                     if fRc:
-                        uResCrc32 = long(crc32_of_file(sResFilePathRaw));
+                        uResCrc32 = long(utils.calcCrc32OfFile(sResFilePathRaw));
                         if uResCrc32 == uOrigCrc:
                             reporter.log('Snapshot merged successfully. Crc32 is correct');