From bbb81bc6864edc077f531a72ecb6bbf73b5b774c Mon Sep 17 00:00:00 2001 From: Kevin Kim Date: Fri, 30 Jun 2023 15:27:43 -0700 Subject: [PATCH] Allow SDK tests to run against staging eu --- Makefile | 7 +++++++ tests/integration/conftest.py | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/Makefile b/Makefile index 5e8904f5c..f9f490554 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,13 @@ test-staging: build-image -e LABELBOX_TEST_API_KEY_STAGING=${LABELBOX_TEST_API_KEY_STAGING} \ local/labelbox-python:test pytest $(PATH_TO_TEST) +test-staging-eu: build-image + docker run -it --rm -v ${PWD}:/usr/src -w /usr/src \ + -e LABELBOX_TEST_ENVIRON="staging-eu" \ + -e DA_GCP_LABELBOX_API_KEY=${DA_GCP_LABELBOX_API_KEY} \ + -e LABELBOX_TEST_API_KEY_STAGING_EU=${LABELBOX_TEST_API_KEY_STAGING_EU} \ + local/labelbox-python:test pytest $(PATH_TO_TEST) + test-prod: build-image docker run -it --rm -v ${PWD}:/usr/src -w /usr/src \ -e LABELBOX_TEST_ENVIRON="prod" \ diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index ee9cff5c3..739c9ca5f 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -32,6 +32,7 @@ class Environ(Enum): STAGING = 'staging' ONPREM = 'onprem' CUSTOM = 'custom' + STAGING_EU = 'staging-eu' @pytest.fixture(scope="session") @@ -54,6 +55,8 @@ def graphql_url(environ: str) -> str: return 'https://api.labelbox.com/graphql' elif environ == Environ.STAGING: return 'https://api.lb-stage.xyz/graphql' + elif environ == Environ.STAGING_EU: + return 'https://api.eu-de.lb-stage.xyz/graphql' elif environ == Environ.ONPREM: hostname = os.environ.get('LABELBOX_TEST_ONPREM_HOSTNAME', None) if hostname is None: @@ -73,6 +76,8 @@ def rest_url(environ: str) -> str: return 'https://api.labelbox.com/api/v1' elif environ == Environ.STAGING: return 'https://api.lb-stage.xyz/api/v1' + elif environ == Environ.STAGING_EU: + return 'https://api.eu-de.lb-stage.xyz/api/v1' elif environ == Environ.CUSTOM: rest_api_endpoint = os.environ.get('LABELBOX_TEST_REST_API_ENDPOINT') if rest_api_endpoint is None: @@ -86,6 +91,8 @@ def testing_api_key(environ: str) -> str: return os.environ["LABELBOX_TEST_API_KEY_PROD"] elif environ == Environ.STAGING: return os.environ["LABELBOX_TEST_API_KEY_STAGING"] + elif environ == Environ.STAGING_EU: + return os.environ["LABELBOX_TEST_API_KEY_STAGING_EU"] elif environ == Environ.ONPREM: return os.environ["LABELBOX_TEST_API_KEY_ONPREM"] elif environ == Environ.CUSTOM: