Changeset 69562 in vbox for trunk/src/VBox/ValidationKit/testdriver

Timestamp:

Nov 3, 2017 1:37:01 PM (7 years ago)

Author:

vboxsync

Message:

testdriver/vbox.py: stupid stupid windows installer putting vboxapi under sdk/install instead of sdk/install. sigh

File:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testdriver/vbox.py

@@ -1274 +1274 @@
         if self.oBuild.sSdkPath is not None:
             sys.path.insert(0, os.path.join(self.oBuild.sSdkPath, 'installer'))
-            sys.path.insert(1, os.path.join(self.oBuild.sSdkPath, 'bindings', 'xpcom', 'python'))
+            sys.path.insert(1, os.path.join(self.oBuild.sSdkPath, 'install')); # stupid stupid windows installer!
+            sys.path.insert(2, os.path.join(self.oBuild.sSdkPath, 'bindings', 'xpcom', 'python'))
         os.environ['VBOX_PROGRAM_PATH'] = self.oBuild.sInstallPath;
         reporter.log("sys.path: %s" % (sys.path));
 
         try:
+            from vboxapi import VirtualBoxManager # pylint: disable=import-error
+        except:
+            reporter.logXcpt('Error importing vboxapi');
+            return False;
+
+        # Exception and error hacks.
+        try:
             # pylint: disable=import-error
-            from vboxapi import VirtualBoxManager
             if self.sHost == 'win':
                 from pythoncom import com_error as NativeComExceptionClass  # pylint: disable=E0611
@@ -1289 +1296 @@
             # pylint: enable=import-error
         except:
-            traceback.print_exc();
+            reporter.logXcpt('Error importing (XP)COM related stuff for exception hacks and errors');
             return False;
-
         __deployExceptionHacks__(NativeComExceptionClass)
         ComError.copyErrors(NativeComErrorClass);