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

Timestamp:

May 23, 2017 5:48:32 PM (8 years ago)

Author:

vboxsync

Message:

Main/glue/vboxapi.py: clean up, remove vbox attribute, eliminate unnecessary parameter of getSessionObject (it is a completely ignored parameter with a default parameter to make life a little simpler for API clients in Python to deal with the previous version still)
Frontends/VBoxShell: adapt to the cleanup, reduce the unnecessary variations in the code dealing with sessions
ValidationKit etc.: adapt to the cleanup

File:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (modified) (1 diff)

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

@@ -2510 +2510 @@
                       or (self.fpApiVer == 4.3 and not hasattr(self.oVBoxMgr, 'getSessionObject')):
                         oSession = self.oVBoxMgr.mgr.getSessionObject(self.oVBox);  # pylint: disable=E1101
+                    elif self.fpApiVer < 5.2 \
+                      or (self.fpApiVer == 5.2 and hasattr(self.oVBoxMgr, 'vbox')):
+                        oSession = self.oVBoxMgr.getSessionObject(self.oVBox);      # pylint: disable=E1101
                     else:
-                        oSession = self.oVBoxMgr.getSessionObject(self.oVBox);      # pylint: disable=E1101
+                        oSession = self.oVBoxMgr.getSessionObject();                # pylint: disable=E1101
                     if self.fpApiVer < 3.3:
                         oProgress = self.oVBox.openRemoteSession(oSession, sUuid, sType, sEnv);