Changeset 93764 in vbox for trunk/src/VBox

Timestamp:

Feb 15, 2022 9:37:30 PM (3 years ago)

Author:

vboxsync

Message:

vsheriff: fixes.

File:

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

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

@@ -1191 +1191 @@
         """
         enmReason = None;
+        sParentName = oFailedResult.oParent.sName if oFailedResult.oParent else '';
         if oFailedResult.sName == 'VBoxWindowsAdditions.exe' >= 0:
             enmReason = self.ktReason_Add_Installer_Win_Failed;
         # guest control:
-        elif oFailedResult.sName == 'Preparations' >= 0 \
-         and oFailedResult.oParent and oFailedResult.oParent.sName == 'Guest Control':
+        elif sParentName == 'Guest Control' and oFailedResult.sName == 'Preparations':
             enmReason = self.ktReason_Add_GstCtl_Preparations;
         elif oFailedResult.sName == 'Session Basics':
@@ -1210 +1210 @@
             enmReason = self.ktReason_Add_GstCtl_Session_Reboot;
         # shared folders:
-        elif oFailedResult.sName == 'Automounting' >= 0 \
-         and oFailedResult.oParent and oFailedResult.oParent.sName == 'Shared Folders':
+        elif sParentName == 'Shared Folders' and oFailedResult.sName == 'Automounting':
             enmReason = self.ktReason_Add_ShFl_Automount;
         elif oFailedResult.sName == 'mmap':
@@ -1218 +1217 @@
             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':
+        elif sParentName == 'Shared Folders' and oFailedResult.sName == 'Running FsPerf':
             enmReason = self.ktReason_Add_ShFl_FsPerf;  ## Maybe it would be better to be more specific...