Changeset 79022 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jun 6, 2019 12:39:01 PM (6 years ago)

Author:

vboxsync

Message:

tdStorageSnapshotMerging1.py: Readable time out values, please! Don't put anything unnecessary inside the try/except block!

File:

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

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

@@ -157 +157 @@
         try:
             oProgressCom = oMedium.resize(cbNewSize);
-            oProgress = vboxwrappers.ProgressWrapper(oProgressCom, self.oVBoxMgr, self.oVBox.oTstDrv,
-                                                     'Resize medium %s' % (oMedium.name));
-            oProgress.wait(cMsTimeout = 15*60*1000); # 15 min
-            oProgress.logResult();
         except:
             reporter.logXcpt('IMedium::resize failed on %s' % (oMedium.name));
             return False;
-
+        oProgress = vboxwrappers.ProgressWrapper(oProgressCom, self.oVBoxMgr, self.oVBox.oTstDrv,
+                                                 'Resize medium %s' % (oMedium.name));
+        oProgress.wait(cMsTimeout = 15*60*1000); # 15 min
+        oProgress.logResult();
         return True;
 
@@ -238 +237 @@
         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.wait(cMsTimeout = 1000000);
-            oProgress.logResult();
         except:
             reporter.errorXcpt('failed to clone medium %s to %s' % (oSrcHd.name, oTgtHd.name));
             return False;
-
+        oProgress = vboxwrappers.ProgressWrapper(oProgressCom, self.oVBoxMgr, self.oVBox.oTstDrv,
+                                                 'clone base disk %s to %s' % (oSrcHd.name, oTgtHd.name));
+        oProgress.wait(cMsTimeout = 15*60*1000); # 15 min
+        oProgress.logResult();
         return True;
 
@@ -260 +258 @@
                 else:
                     oProgress = oVM.delete(None);
-                oProgress.wait(cMsTimeout = 1000000);
-
             except:
                 reporter.logXcpt();
-
+            else:
+                oProgress.wait(cMsTimeout = 15*60*1000); # 15 min
         else:
             try:    oVM.deleteSettings();