Changeset 93032 in vbox for trunk/src/VBox/ValidationKit/testmanager

Timestamp:

Dec 20, 2021 6:38:09 PM (3 years ago)

Author:

vboxsync

Message:

vsheriff: python 3 adjustments, properly handling the iterable stuff which is different than in old python 2. bugref:9788

File:

• trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py

@@ -708 +708 @@
             atValues = dReasonForResultId.values();
             fSingleReason = True;
-            if len(dReasonForResultId) == 1 and dReasonForResultId.keys()[0] != oCaseFile.oTestSet.idTestResult:
-                self.dprint(u'Promoting single reason to whole set: %s' % (atValues[0],));
-            elif len(dReasonForResultId) > 1 and len(atValues) == atValues.count(atValues[0]):
-                self.dprint(u'Merged %d reasons to a single one: %s' % (len(atValues), atValues[0]));
+            if len(dReasonForResultId) == 1 and next(iter(dReasonForResultId.keys())) != oCaseFile.oTestSet.idTestResult:
+                self.dprint(u'Promoting single reason to whole set: %s' % (next(iter(atValues)),));
+            elif len(dReasonForResultId) > 1 and len(atValues) == list(atValues).count(next(iter(atValues))):
+                self.dprint(u'Merged %d reasons to a single one: %s' % (len(atValues), next(iter(atValues))));
             else:
                 fSingleReason = False;
             if fSingleReason:
-                dReasonForResultId = { oCaseFile.oTestSet.idTestResult: atValues[0], };
+                dReasonForResultId = { oCaseFile.oTestSet.idTestResult: next(iter(atValues)), };
                 if dCommentForResultId:
-                    dCommentForResultId = { oCaseFile.oTestSet.idTestResult: dCommentForResultId.values()[0], };
+                    dCommentForResultId = { oCaseFile.oTestSet.idTestResult: next(iter(dCommentForResultId.values())), };
         elif oCaseFile.tReason is not None:
             dReasonForResultId = { oCaseFile.oTestSet.idTestResult: oCaseFile.tReason, };
@@ -725 +725 @@
 
         self.vprint(u'Closing %s with following reason%s: %s'
-                    % ( oCaseFile.sName, 's' if dReasonForResultId > 0 else '', dReasonForResultId, ));
+                    % ( oCaseFile.sName, 's' if len(dReasonForResultId) > 1 else '', dReasonForResultId, ));
 
         #