Changeset 61441 in vbox

Timestamp:

Jun 3, 2016 12:54:27 PM (8 years ago)

Author:

vboxsync

Message:

virtual_test_sheriff.py: Fixed promote-to-single-reason logic.

File:

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

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

@@ -380 +380 @@
     ktReason_Guru_VERR_IEM_ASPECT_NOT_IMPLEMENTED      = ( 'Guru Meditations',  'VERR_IEM_ASPECT_NOT_IMPLEMENTED' );
     ktReason_Guru_VERR_TRPM_DONT_PANIC                 = ( 'Guru Meditations',  'VERR_TRPM_DONT_PANIC' );
+    ktReason_Guru_VERR_PGM_PHYS_PAGE_RESERVED          = ( 'Guru Meditations',  'VERR_PGM_PHYS_PAGE_RESERVED' );
     ktReason_Guru_VINF_EM_TRIPLE_FAULT                 = ( 'Guru Meditations',  'VINF_EM_TRIPLE_FAULT' );
     ktReason_XPCOM_Exit_Minus_11                       = ( 'API / (XP)COM',     'exit -11' );
@@ -418 +419 @@
 
             # Try promote to single reason.
-            if len(dReasonForResultId) > 1:
-                atValues = dReasonForResultId.values();
-                if len(atValues) == atValues.count(atValues[0]):
-                    self.dprint('Merged %d reasons to a single one: %s' % (len(atValues), atValues[0]));
-                    dReasonForResultId = { oCaseFile.oTestSet.idTestResult: atValues[0], };
-                    if len(dCommentForResultId) > 0:
-                        dCommentForResultId = { oCaseFile.oTestSet.idTestResult: dCommentForResultId.values()[0], };
+            atValues = dReasonForResultId.values();
+            fSingleReason = True;
+            if len(dReasonForResultId) == 1 and dReasonForResultId.keys()[0] != oCaseFile.oTestSet.idTestResult:
+                self.dprint('Promoting single reason to whole set: %s' % (atValues[0],));
+            elif len(dReasonForResultId) > 1 and len(atValues) == atValues.count(atValues[0]):
+                self.dprint('Merged %d reasons to a single one: %s' % (len(atValues), atValues[0]));
+            else:
+                fSingleReason = False;
+            if fSingleReason:
+                dReasonForResultId = { oCaseFile.oTestSet.idTestResult: atValues[0], };
+                if len(dCommentForResultId) > 0:
+                    dCommentForResultId = { oCaseFile.oTestSet.idTestResult: dCommentForResultId.values()[0], };
         elif oCaseFile.tReason is not None:
             dReasonForResultId = { oCaseFile.oTestSet.idTestResult: oCaseFile.tReason, };
@@ -568 +574 @@
         # ( Whether to stop on hit, needle, reason tuple ),
         ( False, 'GuruMeditation',                                  ktReason_Guru_Generic ),
+        ( False, 'Guru Meditation',                                 ktReason_Guru_Generic ),
         ( True,  'VERR_IEM_INSTR_NOT_IMPLEMENTED',                  ktReason_Guru_VERR_IEM_INSTR_NOT_IMPLEMENTED ),
         ( True,  'VERR_IEM_ASPECT_NOT_IMPLEMENTED',                 ktReason_Guru_VERR_IEM_ASPECT_NOT_IMPLEMENTED ),
         ( True,  'VERR_TRPM_DONT_PANIC',                            ktReason_Guru_VERR_TRPM_DONT_PANIC ),
+        ( True,  'VERR_PGM_PHYS_PAGE_RESERVED',                     ktReason_Guru_VERR_PGM_PHYS_PAGE_RESERVED ),
         ( True,  'VINF_EM_TRIPLE_FAULT',                            ktReason_Guru_VINF_EM_TRIPLE_FAULT ),
         ( False, 'Exception: 0x800706be (Call to remote object failed (NS_ERROR_CALL_FAILED))',