Adding changes to fix the timeout bug which was caused by the fact that ',' was not removed from '0x506,'.

Author: shaoltan-amazon

scripts/tests/run_tv_casting_test.py

@@ -98,7 +98,8 @@ def handle_casting_failure(casting_state: str, log_file_paths: List[str]):
     sys.exit(1)
 
 
-def extract_value_from_string(line: str) -> str:
+# def extract_value_from_string(line: str) -> str: # SHAO OG
+def extract_value_from_string(line: str, casting_state: str, log_paths) -> str:
     """Extract and return value from given input string.
 
     The string is expected to be in the following format as it is received
@@ -112,17 +113,31 @@ def extract_value_from_string(line: str) -> str:
     \x1b[0;34m[1714583616179] [7029:2386956] [SVR] 	device Name: Test TV casting app\x1b[0m
     The substring to be extracted here is 'Test TV casting app'.
     """
-    if '=' in line:
-        value = line.split('=')[-1].strip().replace(',\x1b[0m', '')
+    # if '=' in line:
+    #     value = line.split('=')[-1].strip().replace(',\x1b[0m', '')
+    # else:
+    #     value = line.split(':')[-1].strip().replace('\x1b[0m', '')
+
+    # return value
+
+    if ':' in line:
+        if '=' in line:
+            delimiter = '='
+        else:
+            delimiter = ':'
+
+        value = line.split(delimiter)[-1].strip().replace('\x1b[0m', '').rstrip(',')
     else:
-        value = line.split(':')[-1].strip().replace('\x1b[0m', '')
+        logging.error('Could not extract the value from the following line: %s', line)
+        handle_casting_failure(casting_state, log_paths)
 
     return value
 
 
 def validate_value(casting_state: str, expected_value: Union[str, int], log_paths: List[str], line: str, value_name: str) -> Optional[str]:
     """Validate a value in a string against an expected value during a given casting state."""
-    value = extract_value_from_string(line)
+    # value = extract_value_from_string(line) # SHAO OG
+    value = extract_value_from_string(line, casting_state, log_paths)
 
     if isinstance(expected_value, int):
         value = int(value)
@@ -187,7 +202,8 @@ def initiate_cast_request_success(tv_casting_app_info: Tuple[subprocess.Popen, T
                 return True
 
 
-def extract_device_info_from_tv_casting_app(tv_casting_app_info: Tuple[subprocess.Popen, TextIO]) -> Tuple[Optional[str], Optional[int], Optional[int]]:
+# def extract_device_info_from_tv_casting_app(tv_casting_app_info: Tuple[subprocess.Popen, TextIO]) -> Tuple[Optional[str], Optional[int], Optional[int]]: # SHAO OG
+def extract_device_info_from_tv_casting_app(tv_casting_app_info: Tuple[subprocess.Popen, TextIO], casting_state: str, log_paths: List[str]) -> Tuple[Optional[str], Optional[int], Optional[int]]:
     """Extract device information from the 'Identification Declaration' block in the Linux tv-casting-app output."""
     tv_casting_app_process, linux_tv_casting_app_log_file = tv_casting_app_info
 
@@ -200,12 +216,15 @@ def extract_device_info_from_tv_casting_app(tv_casting_app_info: Tuple[subproces
         linux_tv_casting_app_log_file.flush()
 
         if 'device Name' in line:
-            device_name = extract_value_from_string(line)
+            # device_name = extract_value_from_string(line) # SHAO OG
+            device_name = extract_value_from_string(line, casting_state, log_paths)
         elif 'vendor id' in line:
-            vendor_id = extract_value_from_string(line)
+            # vendor_id = extract_value_from_string(line) # SHAO OG
+            vendor_id = extract_value_from_string(line, casting_state, log_paths)
             vendor_id = int(vendor_id)
         elif 'product id' in line:
-            product_id = extract_value_from_string(line)
+            # product_id = extract_value_from_string(line) # SHAO OG
+            product_id = extract_value_from_string(line, casting_state, log_paths)
             product_id = int(product_id)
 
         if device_name and vendor_id and product_id:
@@ -354,13 +373,15 @@ def parse_tv_casting_app_for_report_data_msg(tv_casting_app_info: Tuple[subproce
                 report_data_message.append(tv_casting_line.rstrip('\n'))
 
                 if 'Cluster =' in tv_casting_line:
-                    cluster_value = extract_value_from_string(tv_casting_line)
+                    # cluster_value = extract_value_from_string(tv_casting_line) # SHAO OG
+                    cluster_value = extract_value_from_string(tv_casting_line, 'Testing subscription', log_paths)
                     if cluster_value != CLUSTER_MEDIA_PLAYBACK:
                         report_data_message.clear()
                         continue_parsing = False
 
                 elif 'Attribute =' in tv_casting_line:
-                    attribute_value = extract_value_from_string(tv_casting_line)
+                    # attribute_value = extract_value_from_string(tv_casting_line) # SHAO OG
+                    attribute_value = extract_value_from_string(tv_casting_line, 'Testing subscription', log_paths)
                     if attribute_value != ATTRIBUTE_CURRENT_PLAYBACK_STATE:
                         report_data_message.clear()
                         continue_parsing = False
@@ -497,7 +518,8 @@ def test_commissioning_fn(valid_discovered_commissioner_number, tv_casting_app_i
         handle_casting_failure('Commissioning', log_paths)
 
     # Extract the values from the 'Identification Declaration' block in the tv-casting-app output that we want to validate against.
-    expected_device_name, expected_vendor_id, expected_product_id = extract_device_info_from_tv_casting_app(tv_casting_app_info)
+    # expected_device_name, expected_vendor_id, expected_product_id = extract_device_info_from_tv_casting_app(tv_casting_app_info) # SHAO OG
+    expected_device_name, expected_vendor_id, expected_product_id = extract_device_info_from_tv_casting_app(tv_casting_app_info, 'Commissioning', log_paths)
 
     if not validate_identification_declaration_message_on_tv_app(tv_app_info, expected_device_name, expected_vendor_id, expected_product_id, log_paths):
         handle_casting_failure('Commissioning', log_paths)