Changeset 72737 in vbox for trunk/src/VBox/ValidationKit/tests/api

Timestamp:

Jun 29, 2018 7:06:45 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123273

Message:

tdAppliance1.py: Reverted nonsensical semicolon changes from r120609. If this happens again, commit privileges to ValKit will be revoked.

File:

• trunk/src/VBox/ValidationKit/tests/api/tdAppliance1.py (modified) (10 diffs)

trunk/src/VBox/ValidationKit/tests/api/tdAppliance1.py

@@ -43 +43 @@
 
 # Validation Kit imports.
-from testdriver import base
-from testdriver import reporter
-from testdriver import vboxwrappers
+from testdriver import base;
+from testdriver import reporter;
+from testdriver import vboxwrappers;
 
 
@@ -54 +54 @@
 
     def __init__(self, oTstDrv):
-        base.SubTestDriverBase.__init__(self, 'appliance', oTstDrv)
+        base.SubTestDriverBase.__init__(self, 'appliance', oTstDrv);
 
     def testIt(self):
@@ -60 +60 @@
         Execute the sub-testcase.
         """
-        fRc = True
+        fRc = True;
 
         # Import a set of simple OVAs.
@@ -88 +88 @@
             'tdAppliance1-t7-bad-instance.ova',
             ):
-            reporter.testStart(sOva)
+            reporter.testStart(sOva);
             try:
-                fRc = self.testImportOva(os.path.join(g_ksValidationKitDir, 'tests', 'api', sOva)) and fRc
-                fRc = self.testImportOvaAsOvf(os.path.join(g_ksValidationKitDir, 'tests', 'api', sOva)) and fRc
+                fRc = self.testImportOva(os.path.join(g_ksValidationKitDir, 'tests', 'api', sOva)) and fRc;
+                fRc = self.testImportOvaAsOvf(os.path.join(g_ksValidationKitDir, 'tests', 'api', sOva)) and fRc;
             except:
-                reporter.errorXcpt()
-                fRc = False
-            fRc = reporter.testDone() and fRc
+                reporter.errorXcpt();
+                fRc = False;
+            fRc = reporter.testDone() and fRc;
 
         ## @todo more stuff
-        return fRc
+        return fRc;
 
     #
@@ -106 +106 @@
     def testImportOva(self, sOva):
         """ xxx """
-        oVirtualBox = self.oTstDrv.oVBoxMgr.getVirtualBox()
+        oVirtualBox = self.oTstDrv.oVBoxMgr.getVirtualBox();
 
         #
@@ -112 +112 @@
         #
         try:
-            oAppliance = oVirtualBox.createAppliance()
-        except:
-            return reporter.errorXcpt('IVirtualBox::createAppliance failed')
+            oAppliance = oVirtualBox.createAppliance();
+        except:
+            return reporter.errorXcpt('IVirtualBox::createAppliance failed');
 
         try:
             oProgress = vboxwrappers.ProgressWrapper(oAppliance.read(sOva), self.oTstDrv.oVBoxMgr, self.oTstDrv,
-                                                     'read "%s"' % (sOva,))
-        except:
-            return reporter.errorXcpt('IAppliance::read("%s") failed' % (sOva,))
-        oProgress.wait()
-        if oProgress.logResult() is False:
-            return False
-
-        try:
-            oAppliance.interpret()
-        except:
-            return reporter.errorXcpt('IAppliance::interpret() failed on "%s"' % (sOva,))
+                                                     'read "%s"' % (sOva,));
+        except:
+            return reporter.errorXcpt('IAppliance::read("%s") failed' % (sOva,));
+        oProgress.wait();
+        if oProgress.logResult() is False:
+            return False;
+
+        try:
+            oAppliance.interpret();
+        except:
+            return reporter.errorXcpt('IAppliance::interpret() failed on "%s"' % (sOva,));
 
         #
         try:
             oProgress = vboxwrappers.ProgressWrapper(oAppliance.importMachines([]),
-                                                     self.oTstDrv.oVBoxMgr, self.oTstDrv, 'importMachines "%s"' % (sOva,))
-        except:
-            return reporter.errorXcpt('IAppliance::importMachines failed on "%s"' % (sOva,))
-        oProgress.wait()
-        if oProgress.logResult() is False:
-            return False
+                                                     self.oTstDrv.oVBoxMgr, self.oTstDrv, 'importMachines "%s"' % (sOva,));
+        except:
+            return reporter.errorXcpt('IAppliance::importMachines failed on "%s"' % (sOva,));
+        oProgress.wait();
+        if oProgress.logResult() is False:
+            return False;
 
         #
@@ -145 +145 @@
         ## @todo do more with this OVA. Like untaring it and loading it as an OVF.  Export it and import it again.
 
-        return True
+        return True;
 
     def testImportOvaAsOvf(self, sOva):
@@ -151 +151 @@
         Unpacks the OVA into a subdirectory in the scratch area and imports it as an OVF.
         """
-        oVirtualBox = self.oTstDrv.oVBoxMgr.getVirtualBox()
-
-        sTmpDir = os.path.join(self.oTstDrv.sScratchPath, os.path.split(sOva)[1] + '-ovf')
-        sOvf    = os.path.join(sTmpDir, os.path.splitext(os.path.split(sOva)[1])[0] + '.ovf')
+        oVirtualBox = self.oTstDrv.oVBoxMgr.getVirtualBox();
+
+        sTmpDir = os.path.join(self.oTstDrv.sScratchPath, os.path.split(sOva)[1] + '-ovf');
+        sOvf    = os.path.join(sTmpDir, os.path.splitext(os.path.split(sOva)[1])[0] + '.ovf');
 
         #
@@ -160 +160 @@
         #
         try:
-            os.mkdir(sTmpDir, 0o755)
-            oTarFile = tarfile.open(sOva, 'r:*')
-            oTarFile.extractall(sTmpDir)
-            oTarFile.close()
-        except:
-            return reporter.errorXcpt('Unpacking "%s" to "%s" for OVF style importing failed' % (sOvf, sTmpDir,))
+            os.mkdir(sTmpDir, 0o755);
+            oTarFile = tarfile.open(sOva, 'r:*');
+            oTarFile.extractall(sTmpDir);
+            oTarFile.close();
+        except:
+            return reporter.errorXcpt('Unpacking "%s" to "%s" for OVF style importing failed' % (sOvf, sTmpDir,));
 
         #
@@ -171 +171 @@
         #
         try:
-            oAppliance2 = oVirtualBox.createAppliance()
-        except:
-            return reporter.errorXcpt('IVirtualBox::createAppliance failed (#2)')
+            oAppliance2 = oVirtualBox.createAppliance();
+        except:
+            return reporter.errorXcpt('IVirtualBox::createAppliance failed (#2)');
 
         try:
             oProgress = vboxwrappers.ProgressWrapper(oAppliance2.read(sOvf), self.oTstDrv.oVBoxMgr, self.oTstDrv,
-                                                     'read "%s"' % (sOvf,))
-        except:
-            return reporter.errorXcpt('IAppliance::read("%s") failed' % (sOvf,))
-        oProgress.wait()
-        if oProgress.logResult() is False:
-            return False
-
-        try:
-            oAppliance2.interpret()
-        except:
-            return reporter.errorXcpt('IAppliance::interpret() failed on "%s"' % (sOvf,))
+                                                     'read "%s"' % (sOvf,));
+        except:
+            return reporter.errorXcpt('IAppliance::read("%s") failed' % (sOvf,));
+        oProgress.wait();
+        if oProgress.logResult() is False:
+            return False;
+
+        try:
+            oAppliance2.interpret();
+        except:
+            return reporter.errorXcpt('IAppliance::interpret() failed on "%s"' % (sOvf,));
 
         try:
             oProgress = vboxwrappers.ProgressWrapper(oAppliance2.importMachines([]),
-                                                     self.oTstDrv.oVBoxMgr, self.oTstDrv, 'importMachines "%s"' % (sOvf,))
-        except:
-            return reporter.errorXcpt('IAppliance::importMachines failed on "%s"' % (sOvf,))
-        oProgress.wait()
-        if oProgress.logResult() is False:
-            return False
-
-        return True
+                                                     self.oTstDrv.oVBoxMgr, self.oTstDrv, 'importMachines "%s"' % (sOvf,));
+        except:
+            return reporter.errorXcpt('IAppliance::importMachines failed on "%s"' % (sOvf,));
+        oProgress.wait();
+        if oProgress.logResult() is False:
+            return False;
+
+        return True;