fix fixture logic in pre-install

bentsku · bentsku · commit d4741e1e56bc · 2026-02-06T11:40:34.000+01:00
diff --git a/tests/aws/services/es/test_es.py b/tests/aws/services/es/test_es.py
@@ -52,14 +52,13 @@ def run_install(*args):
 
 @pytest.fixture(autouse=True)
 def elasticsearch():
-    if is_aws_cloud() or test_config.TEST_SKIP_LOCALSTACK_START:
-        # we don't install the dependencies if LocalStack is not running in process
-        return
+    # we only install the dependencies if LocalStack is running in the same process
+    if not is_aws_cloud() and not test_config.TEST_SKIP_LOCALSTACK_START:
+        if not installed.is_set():
+            install_async()
 
-    if not installed.is_set():
-        install_async()
+        assert installed.wait(timeout=5 * 60), "gave up waiting for elasticsearch to install"
 
-    assert installed.wait(timeout=5 * 60), "gave up waiting for elasticsearch to install"
     yield
 
 
diff --git a/tests/aws/services/opensearch/test_opensearch.py b/tests/aws/services/opensearch/test_opensearch.py
@@ -82,14 +82,12 @@ def run_install(*args):
 
 @pytest.fixture(autouse=True)
 def opensearch():
-    if is_aws_cloud() or test_config.TEST_SKIP_LOCALSTACK_START:
-        # we don't install the dependencies if LocalStack is not running in process
-        return
-
-    if not installed.is_set():
-        install_async()
+    # we only install the dependencies if LocalStack is running in the same process
+    if not is_aws_cloud() and not test_config.TEST_SKIP_LOCALSTACK_START:
+        if not installed.is_set():
+            install_async()
 
-    assert installed.wait(timeout=5 * 60), "gave up waiting for opensearch to install"
+        assert installed.wait(timeout=5 * 60), "gave up waiting for opensearch to install"
     yield
 
 
diff --git a/tests/aws/services/transcribe/test_transcribe.py b/tests/aws/services/transcribe/test_transcribe.py
@@ -98,24 +98,27 @@ def transcribe_snapshot_transformer(snapshot):
 class TestTranscribe:
     @pytest.fixture(scope="class", autouse=True)
     def pre_install_dependencies(self):
-        if is_aws_cloud() or test_config.TEST_SKIP_LOCALSTACK_START:
-            # we don't install the dependencies if LocalStack is not running in process
-            return
-
-        if not ffmpeg_installed.is_set() or not vosk_installed.is_set():
-            install_async()
+        # we only install the dependencies if LocalStack is running in the same process
+        if not is_aws_cloud() and not test_config.TEST_SKIP_LOCALSTACK_START:
+            if not ffmpeg_installed.is_set() or not vosk_installed.is_set():
+                install_async()
+
+            start = int(time.time())
+            assert vosk_installed.wait(timeout=INSTALLATION_TIMEOUT), (
+                "gave up waiting for Vosk to install"
+            )
+            elapsed = int(time.time() - start)
+            assert ffmpeg_installed.wait(timeout=INSTALLATION_TIMEOUT - elapsed), (
+                "gave up waiting for ffmpeg to install"
+            )
+            LOG.info(
+                "Spent %s seconds downloading transcribe dependencies", int(time.time() - start)
+            )
 
-        start = int(time.time())
-        assert vosk_installed.wait(timeout=INSTALLATION_TIMEOUT), (
-            "gave up waiting for Vosk to install"
-        )
-        elapsed = int(time.time() - start)
-        assert ffmpeg_installed.wait(timeout=INSTALLATION_TIMEOUT - elapsed), (
-            "gave up waiting for ffmpeg to install"
-        )
-        LOG.info("Spent %s seconds downloading transcribe dependencies", int(time.time() - start))
+            assert not installation_errored.is_set(), (
+                "installation of transcribe dependencies failed"
+            )
 
-        assert not installation_errored.is_set(), "installation of transcribe dependencies failed"
         yield
 
     @staticmethod
