From 9ad3c50160ebeb092cfc338f0f429db72597a278 Mon Sep 17 00:00:00 2001 From: Achal Shah Date: Wed, 13 Apr 2022 11:50:22 -0700 Subject: [PATCH] fix: Remove docker step from unit test workflow Signed-off-by: Achal Shah --- .github/workflows/unit_tests.yml | 1 - sdk/python/tests/conftest.py | 16 +++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 6f15ace0415..8f37e2e2a36 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -14,7 +14,6 @@ jobs: PYTHON: ${{ matrix.python-version }} steps: - uses: actions/checkout@v2 - - uses: docker-practice/actions-setup-docker@1.0.9 - name: Setup Python id: setup-python uses: actions/setup-python@v2 diff --git a/sdk/python/tests/conftest.py b/sdk/python/tests/conftest.py index d028055c080..d50055bc2bc 100644 --- a/sdk/python/tests/conftest.py +++ b/sdk/python/tests/conftest.py @@ -173,17 +173,18 @@ class TrinoContainerSingleton: catalog_dir = current_file.parent.joinpath( "integration/feature_repos/universal/data_sources/catalog" ) - - container = ( - DockerContainer("trinodb/trino:376") - .with_volume_mapping(catalog_dir, "/etc/catalog/") - .with_exposed_ports("8080") - ) + container = None is_running = False @classmethod def get_singleton(cls): if not cls.is_running: + cls.container = ( + DockerContainer("trinodb/trino:376") + .with_volume_mapping(cls.catalog_dir, "/etc/catalog/") + .with_exposed_ports("8080") + ) + cls.container.start() log_string_to_wait_for = "SERVER STARTED" wait_for_logs( @@ -194,7 +195,8 @@ def get_singleton(cls): @classmethod def teardown(cls): - cls.container.stop() + if cls.container: + cls.container.stop() @pytest.fixture(