Changeset 93763 in vbox for trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py

Timestamp:

Feb 15, 2022 9:32:45 PM (3 years ago)

Author:

vboxsync

Message:

vsheriff: Shorten GA failure reasons and adjust detection.

File:

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

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

@@ -610 +610 @@
     ## @{
 
-    ktReason_Add_Installer_Win_Failed                  = ( 'Additions',         'Installer (Windows) failed' );
-    ktReason_Add_ShFl_Automount                        = ( 'Additions',         'Shared Folders: Automounting' );
-    ktReason_Add_ShFl_FsPerf                           = ( 'Additions',         'Shared Folders: Runnings FsPerf' );
-    ktReason_Add_GstCtl_Preparations                   = ( 'Additions',         'Guest Control: Preparations' );
-    ktReason_Add_GstCtl_SessionBasics                  = ( 'Additions',         'Guest Control: Session basics' );
-    ktReason_Add_GstCtl_SessionProcRefs                = ( 'Additions',         'Guest Control: Session process references' );
-    ktReason_Add_GstCtl_CopyFromGuest_Timeout          = ( 'Additions',         'Guest Control: Copy from guest timeout' );
-    ktReason_Add_GstCtl_CopyToGuest_Timeout            = ( 'Additions',         'Guest Control: Copy to guest timeout' );
-    ktReason_Add_GstCtl_Session_Reboot                 = ( 'Additions',         'Guest Control: Session w/ reboot' );
+    ktReason_Add_Installer_Win_Failed                  = ( 'Additions',         'Win GA install' );
+    ktReason_Add_ShFl_Automount                        = ( 'Additions',         'Automounting' );
+    ktReason_Add_ShFl_FsPerf                           = ( 'Additions',         'FsPerf' );
+    ktReason_Add_GstCtl_Preparations                   = ( 'Additions',         'GstCtl preparations' );
+    ktReason_Add_GstCtl_SessionBasics                  = ( 'Additions',         'Session basics' );
+    ktReason_Add_GstCtl_SessionProcRefs                = ( 'Additions',         'Session process' );
+    ktReason_Add_GstCtl_Session_Reboot                 = ( 'Additions',         'Session reboot' );
+    ktReason_Add_GstCtl_CopyFromGuest_Timeout          = ( 'Additions',         'CopyFromGuest timeout' );
+    ktReason_Add_GstCtl_CopyToGuest_Timeout            = ( 'Additions',         'CopyToGuest timeout' );
     ktReason_Add_FlushViewOfFile                       = ( 'Additions',         'FlushViewOfFile' );
     ktReason_Add_Mmap_Coherency                        = ( 'Additions',         'mmap coherency' );
@@ -1193 +1193 @@
         if oFailedResult.sName == 'VBoxWindowsAdditions.exe' >= 0:
             enmReason = self.ktReason_Add_Installer_Win_Failed;
-        elif oFailedResult.sName == 'Automounting' >= 0:
-            if sResultLog.find('Shared Folders') >= 0:
-                enmReason = self.ktReason_Add_ShFl_Automount;
-        elif oFailedResult.sName == 'Running FsPerf' >= 0:
-            if sResultLog.find('Shared Folders') >= 0:
-                enmReason = self.ktReason_Add_ShFl_FsPerf;
-        elif oFailedResult.sName == 'Preparations' >= 0:
-            if sResultLog.find('Guest Control') >= 0:
-                enmReason = self.ktReason_Add_GstCtl_Preparations;
+        # guest control:
+        elif oFailedResult.sName == 'Preparations' >= 0 \
+         and oFailedResult.oParent and oFailedResult.oParent.sName == 'Guest Control':
+            enmReason = self.ktReason_Add_GstCtl_Preparations;
         elif oFailedResult.sName == 'Session Basics':
             enmReason = self.ktReason_Add_GstCtl_SessionBasics;
@@ -1214 +1209 @@
         elif oFailedResult.sName.find('Session w/ Guest Reboot') >= 0:
             enmReason = self.ktReason_Add_GstCtl_Session_Reboot;
+        # shared folders:
+        elif oFailedResult.sName == 'Automounting' >= 0 \
+         and oFailedResult.oParent and oFailedResult.oParent.sName == 'Shared Folders':
+            enmReason = self.ktReason_Add_ShFl_Automount;
         elif oFailedResult.sName == 'mmap':
             if sResultLog.find('FsPerf: Flush issue at offset ') >= 0:
@@ -1219 +1218 @@
             elif sResultLog.find('FlushViewOfFile') >= 0:
                 enmReason = self.ktReason_Add_FlushViewOfFile;
+        elif oFailedResult.sName == 'Running FsPerf' >= 0 \
+         and oFailedResult.oParent and oFailedResult.oParent.sName == 'Shared Folders':
+            enmReason = self.ktReason_Add_ShFl_FsPerf;  ## Maybe it would be better to be more specific...
 
         if enmReason is not None: