Clarify test skip for legacy local executor

joe4dev · joe4dev · commit 9df0b2362908 · 2023-03-20T12:35:38.000+01:00
diff --git a/localstack/testing/aws/lambda_utils.py b/localstack/testing/aws/lambda_utils.py
@@ -2,6 +2,7 @@
 import os
 from typing import Literal
 
+from localstack.services.awslambda.lambda_api import use_docker
 from localstack.utils.common import to_str
 from localstack.utils.sync import ShortCircuitWaitException, retry
 from localstack.utils.testutil import get_lambda_log_events
@@ -116,6 +117,14 @@ def get_events():
     return retry(get_events, retries=retries, sleep_before=2)
 
 
+def is_old_local_executor() -> bool:
+    """Returns True if running in local executor mode and False otherwise.
+    The new provider ignores the LAMBDA_EXECUTOR flag and `not use_docker()` covers the fallback case if
+    the Docker socket is not available.
+    """
+    return is_old_provider() and not use_docker()
+
+
 def is_old_provider():
     return os.environ.get("TEST_TARGET") != "AWS_CLOUD" and os.environ.get(
         "PROVIDER_OVERRIDE_LAMBDA"
diff --git a/tests/integration/awslambda/test_lambda.py b/tests/integration/awslambda/test_lambda.py
@@ -16,6 +16,7 @@
 from localstack.testing.aws.lambda_utils import (
     concurrency_update_done,
     get_invoke_init_type,
+    is_old_local_executor,
     is_old_provider,
     update_done,
 )
@@ -380,8 +381,8 @@ def test_runtime_introspection_arm(self, lambda_client, create_lambda_function,
 
     @pytest.mark.skipif(is_old_provider(), reason="unsupported in old provider")
     @pytest.mark.skipif(
-        not use_docker(),
-        reason="Monkeypatching of Docker-related flag not applicable if run locally",
+        is_old_local_executor(),
+        reason="Monkey-patching of Docker flags is not applicable because no new container is spawned",
     )
     @pytest.mark.only_localstack
     def test_ignore_architecture(
