Skip to content

[DRAFT] chore(tests): re-enable pipeline system tests on kokoro #1127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: pipeline-preview
Choose a base branch
from
Draft

[DRAFT] chore(tests): re-enable pipeline system tests on kokoro #1127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions tests/system/test__helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,3 @@
# run all tests against default database, and a named database
TEST_DATABASES = [None, FIRESTORE_OTHER_DB]
TEST_DATABASES_W_ENTERPRISE = TEST_DATABASES + [FIRESTORE_ENTERPRISE_DB]
# TODO remove when kokoro fully supports enterprise mode/pipelines
IS_KOKORO_TEST = os.getenv("KOKORO_JOB_NAME") is not None
8 changes: 1 addition & 7 deletions tests/system/test_pipeline_acceptance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,10 @@

from google.cloud.firestore import Client, AsyncClient

from test__helpers import FIRESTORE_ENTERPRISE_DB, IS_KOKORO_TEST
from test__helpers import FIRESTORE_ENTERPRISE_DB

FIRESTORE_PROJECT = os.environ.get("GCLOUD_PROJECT")

# TODO: enable kokoro tests when internal test project is whitelisted
pytestmark = pytest.mark.skipif(
condition=IS_KOKORO_TEST,
reason="Pipeline tests are currently not supported by kokoro",
)

test_dir_name = os.path.dirname(__file__)

id_format = (
Expand Down
10 changes: 0 additions & 10 deletions tests/system/test_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
ENTERPRISE_MODE_ERROR,
TEST_DATABASES,
TEST_DATABASES_W_ENTERPRISE,
IS_KOKORO_TEST,
)


Expand All @@ -67,10 +66,6 @@ def _get_credentials_and_project():
def database(request):
from test__helpers import FIRESTORE_ENTERPRISE_DB

# enterprise mode currently does not support RunQuery calls in prod on kokoro test project
# TODO: remove skip when kokoro test project supports full enterprise mode
if request.param == FIRESTORE_ENTERPRISE_DB and IS_KOKORO_TEST:
pytest.skip("enterprise mode does not support RunQuery on kokoro")
return request.param


Expand Down Expand Up @@ -99,11 +94,6 @@ def verify_pipeline(query):
"""
from google.cloud.firestore_v1.base_aggregation import BaseAggregationQuery

# return early on kokoro. Test project doesn't currently support pipelines
# TODO: enable pipeline verification when kokoro test project is whitelisted
if IS_KOKORO_TEST:
pytest.skip("skipping pipeline verification on kokoro")

def _clean_results(results):
if isinstance(results, dict):
return {k: _clean_results(v) for k, v in results.items()}
Expand Down
10 changes: 0 additions & 10 deletions tests/system/test_system_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
ENTERPRISE_MODE_ERROR,
TEST_DATABASES,
TEST_DATABASES_W_ENTERPRISE,
IS_KOKORO_TEST,
)

RETRIES = retries.AsyncRetry(
Expand Down Expand Up @@ -145,10 +144,6 @@ def _verify_explain_metrics_analyze_false(explain_metrics):
def database(request):
from test__helpers import FIRESTORE_ENTERPRISE_DB

# enterprise mode currently does not support RunQuery calls in prod on kokoro test project
# TODO: remove skip when kokoro test project supports full enterprise mode
if request.param == FIRESTORE_ENTERPRISE_DB and IS_KOKORO_TEST:
pytest.skip("enterprise mode does not support RunQuery on kokoro")
return request.param


Expand Down Expand Up @@ -179,11 +174,6 @@ async def verify_pipeline(query):
"""
from google.cloud.firestore_v1.base_aggregation import BaseAggregationQuery

# return early on kokoro. Test project doesn't currently support pipelines
# TODO: enable pipeline verification when kokoro test project is whitelisted
if IS_KOKORO_TEST:
pytest.skip("skipping pipeline verification on kokoro")

def _clean_results(results):
if isinstance(results, dict):
return {k: _clean_results(v) for k, v in results.items()}
Expand Down