diff --git a/tests/system/test__helpers.py b/tests/system/test__helpers.py index 74b12b7c3..434e1c875 100644 --- a/tests/system/test__helpers.py +++ b/tests/system/test__helpers.py @@ -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 diff --git a/tests/system/test_pipeline_acceptance.py b/tests/system/test_pipeline_acceptance.py index fd74d9458..232d350e5 100644 --- a/tests/system/test_pipeline_acceptance.py +++ b/tests/system/test_pipeline_acceptance.py @@ -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 = ( diff --git a/tests/system/test_system.py b/tests/system/test_system.py index ce4f64b32..46d28c569 100644 --- a/tests/system/test_system.py +++ b/tests/system/test_system.py @@ -45,7 +45,6 @@ ENTERPRISE_MODE_ERROR, TEST_DATABASES, TEST_DATABASES_W_ENTERPRISE, - IS_KOKORO_TEST, ) @@ -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 @@ -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()} diff --git a/tests/system/test_system_async.py b/tests/system/test_system_async.py index ed679402a..c412c2125 100644 --- a/tests/system/test_system_async.py +++ b/tests/system/test_system_async.py @@ -56,7 +56,6 @@ ENTERPRISE_MODE_ERROR, TEST_DATABASES, TEST_DATABASES_W_ENTERPRISE, - IS_KOKORO_TEST, ) RETRIES = retries.AsyncRetry( @@ -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 @@ -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()}