From d0bbe2bba587667174b3286f77679d2552a1d56c Mon Sep 17 00:00:00 2001
From: ggeorgea <ggeorgea@matrox.com>
Date: Wed, 1 Nov 2023 15:57:44 -0400
Subject: [PATCH] - Fix occasional exceptions caused by undefined variables.

- Fix wrong list of receivers with outputs. Needed to test both audio and video properly.
- New 256 byte EDID with CEA extension, prevents audio stream from going down during IS-11 test.
---
 nmostesting/IS11Utils.py         |   1 +
 nmostesting/suites/IS1101Test.py |  23 ++++++++++++++---------
 test_data/IS1101/valid_edid.bin  | Bin 128 -> 256 bytes
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/nmostesting/IS11Utils.py b/nmostesting/IS11Utils.py
index 54822f4f..3344801d 100644
--- a/nmostesting/IS11Utils.py
+++ b/nmostesting/IS11Utils.py
@@ -170,6 +170,7 @@ def stable_state_request(self, receiver_id, activated_receivers):
         return valid, activated_receivers
 
     def activate_reference_sender_and_receiver(self, reference_senders, format, receiver, receiver_id):
+        valid = False
         for sender_id in reference_senders[format]:
             valid, response = self.reference_is04_utils.checkCleanRequestJSON("GET", "senders/" + sender_id)
             if not valid:
diff --git a/nmostesting/suites/IS1101Test.py b/nmostesting/suites/IS1101Test.py
index f9b625dd..b0410267 100644
--- a/nmostesting/suites/IS1101Test.py
+++ b/nmostesting/suites/IS1101Test.py
@@ -1092,7 +1092,7 @@ def test_02_02_03_01(self, test):
         return test.PASS()
 
     def test_02_02_03_02(self, test):
-        "Verify that the video sender supports the minimum set of video constraints"
+        "Verify that the audio sender supports the minimum set of audio constraints"
 
         sample = "^urn:x-nmos:cap:"
 
@@ -3610,6 +3610,7 @@ def test_04_03(self, test):
         connection_api_senders = IS05Utils(CONFIG.IS11_REFERENCE_SENDER_CONNECTION_API_URL).get_senders()
 
         for format in ["urn:x-nmos:format:video", "urn:x-nmos:format:audio"]:
+            self.reference_senders[format] = []
             for sender_id in connection_api_senders:
                 valid, response = self.reference_is04_utils.checkCleanRequestJSON("GET", "senders/" + sender_id)
                 if not valid:
@@ -3674,9 +3675,10 @@ def test_04_03_01(self, test):
             activated_receivers = response
             break
         try:
-            if (activated_receivers < len(self.receivers_with_outputs)):
+            if (activated_receivers < len(self.is11_utils.receivers_with_or_without_outputs)):
                 return test.WARNING("There are no compatible senders for {} receivers"
-                                    .format(len(self.receivers_with_outputs) - activated_receivers))
+                                    .format(len(self.is11_utils.receivers_with_or_without_outputs)
+                                            - activated_receivers))
         except Exception:
             return test.UNCLEAR("No activated receivers")
 
@@ -3809,9 +3811,10 @@ def test_04_03_02(self, test):
             activated_receivers = response
             break
         try:
-            if (activated_receivers < len(self.receivers_with_outputs)):
+            if (activated_receivers < len(self.is11_utils.receivers_with_or_without_outputs)):
                 return test.WARNING("There are no compatible senders for {} receivers"
-                                    .format(len(self.receivers_with_outputs) - activated_receivers))
+                                    .format(len(self.is11_utils.receivers_with_or_without_outputs)
+                                            - activated_receivers))
         except Exception:
             return test.UNCLEAR("No activated receivers")
 
@@ -3976,9 +3979,10 @@ def test_04_04_01(self, test):
             activated_receivers = response
             break
         try:
-            if (activated_receivers < len(self.receivers_without_outputs)):
+            if (activated_receivers < len(self.is11_utils.receivers_with_or_without_outputs)):
                 return test.WARNING("There are no compatible senders for {} receivers"
-                                    .format(len(self.receivers_without_outputs) - activated_receivers))
+                                    .format(len(self.is11_utils.receivers_with_or_without_outputs)
+                                            - activated_receivers))
         except Exception:
             return test.UNCLEAR("No activated receivers")
         return test.PASS()
@@ -4020,9 +4024,10 @@ def test_04_04_02(self, test):
             activated_receivers = response
             break
         try:
-            if (activated_receivers < len(self.receivers_without_outputs)):
+            if (activated_receivers < len(self.is11_utils.receivers_with_or_without_outputs)):
                 return test.WARNING("There are no compatible senders for {} receivers"
-                                    .format(len(self.receivers_without_outputs) - activated_receivers))
+                                    .format(len(self.is11_utils.receivers_with_or_without_outputs)
+                                            - activated_receivers))
         except Exception:
             return test.UNCLEAR("No activated receivers")
         return test.PASS()
diff --git a/test_data/IS1101/valid_edid.bin b/test_data/IS1101/valid_edid.bin
index 8811f5ca5d1c8eb26ac391318c9f654e2bc33e26..501d3508e223b44c7a81b3358d8f3d2861eaf6da 100644
GIT binary patch
literal 256
zcmZSh4+ad9?}c`~-?#Q2w<05RL!Mm)m%`Z<p@9okc-_4gb1*a>Xk=*QZ*-W-u$iH;
zfsv8PszIXALf0We$Bn@~!-;`GZlx5%f&d0F0|Nzfh=>#e1H&H%H-CR!C&wUN4;L;4
z1)#`Z25}$$Kz;@w4+I!jFfl6^dNDFFv#_$UD@;(*<YZ?TWe*5vXGmk_VK885c*MYu
zu*?-|8KW%FdKoc=2pv_3$UH__hN8d=ate7Gp-?qFTo<|&9_R`P*iD0oNc3<m5DEMs
P#-LW?3=x^Zz|aK%7Arsj

literal 128
zcmZSh4+acAx{nyl4Lx1dco~@+l%y-P-c4N`;xki?KOkiP`-aAbLVrdiV4%e?BalJM
z!Jt5xA&5_qfkBRef#ENMg|}QF9|M;H7yw27Fa%fTCHp28m!uW}MS&v!89a;v!z~RA
K42{h|B3=N%ydePq