Increase error verbosity

AMWA-TV · May 15, 2024 · b30005a · b30005a
1 parent c500676
commit b30005a
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/nmostesting/suites/IS1101Test.py b/nmostesting/suites/IS1101Test.py
@@ -225,7 +225,7 @@ def test_01_01(self, test):
     def test_01_02(self, test):
         """Inputs with Base EDID support handle PUTting and DELETing the Base EDID"""
         def is_edid_equal_to_effective_edid(self, test, inputId, edid):
-            return self.get_effective_edid(test, inputId) == edid
+            return self.get_effective_edid(test, inputId) == edid, ""
 
         if len(self.base_edid_inputs) == 0:
             return test.UNCLEAR("Not tested. No inputs with Base EDID support found.")
@@ -454,10 +454,10 @@ def test_01_06(self, test):
         """Effective EDID updates if Base EDID changes with 'adjust_to_caps'"""
 
         def is_edid_equal_to_effective_edid(self, test, inputId, edid):
-            return self.get_effective_edid(test, inputId) == edid
+            return self.get_effective_edid(test, inputId) == edid, ""
 
         def is_edid_inequal_to_effective_edid(self, test, inputId, edid):
-            return self.get_effective_edid(test, inputId) != edid
+            return self.get_effective_edid(test, inputId) != edid, ""
 
         if len(self.adjust_to_caps_inputs) == 0:
             return test.UNCLEAR("Not tested. No inputs with 'adjust_to_caps' support found.")
@@ -2469,11 +2469,13 @@ def get_outputs_edid(self, test, output_id):
         return response.content
 
     def wait_until_true(self, predicate):
+        err = ""
         for i in range(0, CONFIG.STABLE_STATE_ATTEMPTS):
-            if predicate():
+            result, err = predicate()
+            if result:
                 return True
             time.sleep(CONFIG.STABLE_STATE_DELAY)
-        return False
+        return False, err
 
     def has_sender_flow_format(self, sender_id, format):
         assert format in ["video", "audio"]
@@ -2664,7 +2666,8 @@ def is_sender_state_equal_to_expected(self, test, sender_id, expected):
                 "The streamcompatibility request for sender {} status has failed: {}"
                 .format(sender_id, response.json())
             )
-        return response.json()["state"] == expected
+        actual_state = response.json()["state"]
+        return actual_state == expected, actual_state
 
     def apply_nop_active_constraints(self, test, senders, make_active_constraints, source_attrs, flow_attrs):
         if len(senders) == 0: