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

Timestamp:

Mar 22, 2021 8:59:46 PM (4 years ago)

Author:

vboxsync

Message:

ValidationKit/tdStorageSnapshotMerging1: pylint-2.x points out that the
expression 'uOrigCrc = 0xa8f5daa3' redefines 'uOrigCrc' to a long since
the value 0xa8f5daa3 exceeds MAX_INT. Thus specify 'uOrigCrc' and
'uResCrc32' (which is promoted to 'long' in the comparison 'if uResCrc32

uOrigCrc') as long data types and then include the Python3

compatibility hack of 'long = int' since Python3 dropped support for the
'long' data type.

File:

• trunk/src/VBox/ValidationKit/tests/storage/tdStorageSnapshotMerging1.py (modified) (3 diffs)

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

@@ -48 +48 @@
 from testdriver import vboxcon;
 from testdriver import vboxwrappers;
+
+# Python 3 hacks:
+if sys.version_info[0] >= 3:
+    long = int;     # pylint: disable=redefined-builtin,invalid-name
 
 
@@ -284 +288 @@
         fFmtDynamic = oDskFmt.id == 'VDI';
         sOrigWithDiffHd = '5.3/storage/mergeMedium/t-fixed.vdi'
-        uOrigCrc = 0x7a417cbb;
+        uOrigCrc = long(0x7a417cbb);
 
         if fFmtDynamic:
             sOrigWithDiffHd = '5.3/storage/mergeMedium/t-resized.vdi';
-            uOrigCrc = 0xa8f5daa3;
+            uOrigCrc = long(0xa8f5daa3);
 
         oOrigWithDiffHd = self.openMedium(sOrigWithDiffHd);
@@ -343 +347 @@
                     fRc = fRc and self.cloneMedium(oHd, oResHd);
 
-                    uResCrc32 = 0;
+                    uResCrc32 = long(0);
                     if fRc:
-                        uResCrc32 = crc32_of_file(sResFilePathRaw);
+                        uResCrc32 = long(crc32_of_file(sResFilePathRaw));
                         if uResCrc32 == uOrigCrc:
                             reporter.log('Snapshot merged successfully. Crc32 is correct');