Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
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
11 changes: 0 additions & 11 deletions tests/system/test_system.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
ENTERPRISE_MODE_ERROR,
TEST_DATABASES,
TEST_DATABASES_W_ENTERPRISE,
IS_KOKORO_TEST,
FIRESTORE_ENTERPRISE_DB,
)

Expand All @@ -69,10 +68,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 @@ -101,11 +96,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 Expand Up @@ -1825,7 +1815,6 @@ def test_query_stream_w_read_time(query_docs, cleanup, database):
assert new_values[new_ref.id] == new_data


@pytest.mark.skipif(IS_KOKORO_TEST, reason="skipping pipeline verification on kokoro")
@pytest.mark.parametrize("database", [FIRESTORE_ENTERPRISE_DB], indirect=True)
def test_pipeline_w_read_time(query_docs, cleanup, database):
collection, stored, allowed_vals = query_docs
Expand Down
11 changes: 0 additions & 11 deletions tests/system/test_system_async.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
ENTERPRISE_MODE_ERROR,
TEST_DATABASES,
TEST_DATABASES_W_ENTERPRISE,
IS_KOKORO_TEST,
FIRESTORE_ENTERPRISE_DB,
)

Expand Down Expand Up @@ -147,10 +146,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 @@ -181,11 +176,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 Expand Up @@ -1694,7 +1684,6 @@ async def test_pipeline_explain_options_using_additional_options(
assert "Execution:" in text_stats


@pytest.mark.skipif(IS_KOKORO_TEST, reason="skipping pipeline verification on kokoro")
@pytest.mark.parametrize("database", [FIRESTORE_ENTERPRISE_DB], indirect=True)
async def test_pipeline_w_read_time(query_docs, cleanup, database):
collection, stored, allowed_vals = query_docs
Expand Down