Changeset 55818 in vbox

Timestamp:

May 12, 2015 10:00:06 AM (9 years ago)

Author:

vboxsync

Message:

ValidationKit: adapt to renamed API attribute

File:

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

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

@@ -9 +9 @@
 __copyright__ = \
 """
-Copyright (C) 2010-2014 Oracle Corporation
+Copyright (C) 2010-2015 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1781 +1781 @@
         else:
             reporter.log("  Session PID:        %u (%#x)" % (oVM.sessionPid, oVM.sessionPid));
-        reporter.log("  Session Type:       %s" % (oVM.sessionType));
+        if self.fpApiVer >= 5.0:
+            reporter.log("  Session Name:       %s" % (oVM.sessionName));
+        else:
+            reporter.log("  Session Name:       %s" % (oVM.sessionType));
         reporter.log("  CPUs:               %s" % (oVM.CPUCount));
         reporter.log("  RAM:                %sMB" % (oVM.memorySize));
@@ -2220 +2223 @@
         try:
             eCurState =             oVM.sessionState;
-            sCurType  = sOrgType  = oVM.sessionType;
+            if self.fpApiVer >= 5.0:
+                sCurName  = sOrgName  = oVM.sessionName;
+            else:
+                sCurName  = sOrgName  = oVM.sessionType;
             if self.fpApiVer >= 4.2:
                 iCurPid   = iOrgPid   = oVM.sessionPID;
@@ -2234 +2240 @@
         msStart = base.timestampMilli();
         while iCurPid  == iOrgPid \
-          and sCurType == sOrgType \
-          and sCurType != '' \
+          and sCurName == sOrgName \
+          and sCurName != '' \
           and base.timestampMilli() - msStart < cMsTimeout \
           and (   eCurState == vboxcon.SessionState_Unlocking \
@@ -2243 +2249 @@
             try:
                 eCurState = oVM.sessionState;
-                sCurType  = oVM.sessionType;
+                sCurName  = oVM.sessionName if self.fpApiVer >= 5.0 else oVM.sessionType;
                 iCurPid   = oVM.sessionPID if self.fpApiVer >= 4.2 else oVM.sessionPid;
             except Exception, oXcpt: