[Test Proxy] Account for unexpected TypeErrors (Azure#29476)

Author: mccoyp

tools/azure-sdk-tools/devtools_testutils/aio/proxy_testcase_async.py

@@ -67,27 +67,38 @@ async def combined_call(*args, **kwargs):
         AioHttpTransport.send = combined_call
 
         # call the modified function
-        # we define test_output before invoking the test so the variable is defined in case of an exception
-        test_output = None
+        # we define test_variables before invoking the test so the variable is defined in case of an exception
+        test_variables = None
+        # this tracks whether the test has been run yet; used when calling the test function with/without `variables`
+        # running without `variables` in the `except` block leads to unnecessary exceptions in test execution output
+        test_run = False
         try:
             try:
-                test_output = await test_func(*args, variables=variables, **trimmed_kwargs)
-            except TypeError:
-                logger = logging.getLogger()
-                logger.info(
-                    "This test can't accept variables as input. The test method should accept `**kwargs` and/or a "
-                    "`variables` parameter to make use of recorded test variables."
-                )
-                test_output = await test_func(*args, **trimmed_kwargs)
+                test_variables = await test_func(*args, variables=variables, **trimmed_kwargs)
+                test_run = True
+            except TypeError as error:
+                if "unexpected keyword argument" in str(error) and "variables" in str(error):
+                    logger = logging.getLogger()
+                    logger.info(
+                        "This test can't accept variables as input. The test method should accept `**kwargs` and/or a "
+                        "`variables` parameter to make use of recorded test variables."
+                    )
+                else:
+                    raise error
+            # if the test couldn't accept `variables`, run the test without passing them
+            if not test_run:
+                test_variables = await test_func(*args, **trimmed_kwargs)
+
         except ResourceNotFoundError as error:
             error_body = ContentDecodePolicy.deserialize_from_http_generics(error.response)
             message = error_body.get("message") or error_body.get("Message")
             error_with_message = ResourceNotFoundError(message=message, response=error.response)
             raise error_with_message from error
+
         finally:
             AioHttpTransport.send = original_transport_func
-            stop_record_or_playback(test_id, recording_id, test_output)
+            stop_record_or_playback(test_id, recording_id, test_variables)
 
-        return test_output
+        return test_variables
 
     return record_wrap

tools/azure-sdk-tools/devtools_testutils/proxy_testcase.py

@@ -220,21 +220,32 @@ def combined_call(*args, **kwargs):
         # call the modified function
         # we define test_variables before invoking the test so the variable is defined in case of an exception
         test_variables = None
+        # this tracks whether the test has been run yet; used when calling the test function with/without `variables`
+        # running without `variables` in the `except` block leads to unnecessary exceptions in test execution output
+        test_run = False
         try:
             try:
                 test_variables = test_func(*args, variables=variables, **trimmed_kwargs)
-            except TypeError:
-                logger = logging.getLogger()
-                logger.info(
-                    "This test can't accept variables as input. The test method should accept `**kwargs` and/or a "
-                    "`variables` parameter to make use of recorded test variables."
-                )
+                test_run = True
+            except TypeError as error:
+                if "unexpected keyword argument" in str(error) and "variables" in str(error):
+                    logger = logging.getLogger()
+                    logger.info(
+                        "This test can't accept variables as input. The test method should accept `**kwargs` and/or a "
+                        "`variables` parameter to make use of recorded test variables."
+                    )
+                else:
+                    raise error
+            # if the test couldn't accept `variables`, run the test without passing them
+            if not test_run:
                 test_variables = test_func(*args, **trimmed_kwargs)
+
         except ResourceNotFoundError as error:
             error_body = ContentDecodePolicy.deserialize_from_http_generics(error.response)
             message = error_body.get("message") or error_body.get("Message")
             error_with_message = ResourceNotFoundError(message=message, response=error.response)
             six.raise_from(error_with_message, error)
+
         finally:
             RequestsTransport.send = original_transport_func
             stop_record_or_playback(test_id, recording_id, test_variables)