Index: /trunk/src/VBox/ValidationKit/tests/storage/tdStorageSnapshotMerging1.py
===================================================================
--- /trunk/src/VBox/ValidationKit/tests/storage/tdStorageSnapshotMerging1.py	(revision 75374)
+++ /trunk/src/VBox/ValidationKit/tests/storage/tdStorageSnapshotMerging1.py	(revision 75375)
@@ -33,5 +33,4 @@
 import os;
 import sys;
-import uuid;
 import zlib;
 
@@ -123,5 +122,7 @@
         # Construct the resource list the first time it's queried.
         if self.asRsrcs is None:
-            self.asRsrcs = ['5.3/storage/mergeMedium/t-orig.vdi', '5.3/storage/mergeMedium/t-fixed.vdi', '5.3/storage/mergeMedium/t-resized.vdi'];
+            self.asRsrcs = ['5.3/storage/mergeMedium/t-orig.vdi',
+                            '5.3/storage/mergeMedium/t-fixed.vdi',
+                            '5.3/storage/mergeMedium/t-resized.vdi'];
         return self.asRsrcs;
 
@@ -152,5 +153,6 @@
         try:
             oProgressCom = oMedium.resize(cbNewSize);
-            oProgress = vboxwrappers.ProgressWrapper(oProgressCom, self.oVBoxMgr, self.oVBox.oTstDrv, 'Resize medium %s' % (oMedium.name));
+            oProgress = vboxwrappers.ProgressWrapper(oProgressCom, self.oVBoxMgr, self.oVBox.oTstDrv,
+                                                     'Resize medium %s' % (oMedium.name));
             oProgress.wait(cMsTimeout = 60 * 1000);
             oProgress.logResult();
@@ -228,5 +230,6 @@
         try:
             oProgressCom = oSrcHd.cloneTo(oTgtHd, (vboxcon.MediumVariant_Standard, ), None);
-            oProgress = vboxwrappers.ProgressWrapper(oProgressCom, self.oVBoxMgr, self.oVBox.oTstDrv, 'clone base disk %s to %s' % (oSrcHd.name, oTgtHd.name));
+            oProgress = vboxwrappers.ProgressWrapper(oProgressCom, self.oVBoxMgr, self.oVBox.oTstDrv,
+                                                     'clone base disk %s to %s' % (oSrcHd.name, oTgtHd.name));
             oProgress.wait(cMsTimeout = 60 * 1000);
             oProgress.logResult();
@@ -242,6 +245,5 @@
         except:
             reporter.logXcpt();
-            pass;
-        
+
         if self.fpApiVer >= 4.0:
             try:
@@ -316,5 +318,5 @@
         oHd = oSession.createBaseHd(sHddPath, sFmt=oDskFmt.id, cb=oOrigBaseHd.logicalSize);
         #if oSession.createBaseHd can't create disk because it exists, oHd will point to some stub object anyway
-        fRc = fRc and oHd is not None and oHd.logicalSize == oOrigBaseHd.logicalSize;
+        fRc = fRc and oHd is not None and (oHd.logicalSize == oOrigBaseHd.logicalSize);
         fRc = fRc and self.cloneMedium(oOrigBaseHd, oHd);
             
@@ -341,18 +343,19 @@
                     sResFilePath = os.path.join(self.oVBox.oTstDrv.sScratchPath, 't_res.vmdk');
                     sResFilePathRaw = os.path.join(self.oVBox.oTstDrv.sScratchPath, 't_res-flat.vmdk');
-                    oResHd = oSession.createBaseHd(sResFilePath, sFmt='VMDK', cb=oOrigWithDiffHd.logicalSize, tMediumVariant = (vboxcon.MediumVariant_Fixed, ));
+                    oResHd = oSession.createBaseHd(sResFilePath, sFmt='VMDK', cb=oOrigWithDiffHd.logicalSize,
+                                                   tMediumVariant = (vboxcon.MediumVariant_Fixed, ));
                     fRc = oResHd is not None;
                     fRc = fRc and self.cloneMedium(oHd, oResHd);
-                    
+
                     uResCrc32 = 0;
                     if fRc:
                         uResCrc32 = crc32_of_file(sResFilePathRaw);
                         if uResCrc32 == uOrigCrc:
-                            reporter.log('Snapshot merged successfully. Data of the result medium are correspond to data of the original medium');
+                            reporter.log('Snapshot merged successfully. Crc32 is correct');
                             fRc = True;
                         else:
-                            reporter.error('Snapshot merging failed. Data of the result medium not correspond to data of the original medium');
+                            reporter.error('Snapshot merging failed. Crc32 is invalid');
                             fRc = False;
-                    
+
                     self.oVBox.deleteHdByMedium(oResHd);
 
@@ -360,9 +363,9 @@
             if oHd is not None:
                 oSession.detachHd(sController, iPort = 0, iDevice = 0);
-                
+
             oSession.saveSettings(fClose = True);
             if oHd is not None:
                 self.oVBox.deleteHdByMedium(oHd);
-        
+
         self.deleteVM(oVM);
         return fRc;
@@ -374,5 +377,5 @@
         if not self.importVBoxApi():
             return False;
-        
+
         sVmName = 'testvm';
         reporter.testStart(sVmName);
@@ -381,5 +384,5 @@
         if aoDskFmts is None or len(aoDskFmts) < 1:
             return False;
-        
+
         fRc = True;
         for sStorageCtrl in self.asStorageCtrls:
@@ -397,7 +400,7 @@
             else:
                 eStorageCtrl = None;
-            
+
             for oDskFmt in aoDskFmts:
-                if (oDskFmt.id in self.asDiskFormats):
+                if oDskFmt.id in self.asDiskFormats:
                     reporter.testStart('%s' % (oDskFmt.id));
                     fRc = self.test1OneCfg(eStorageCtrl, oDskFmt);
@@ -405,9 +408,9 @@
                     if not fRc:
                         break;
-        
+
             reporter.testDone();
             if not fRc:
                 break;
-        
+
         reporter.testDone();
         return fRc;