diff --git a/packages/google-cloud-spanner/samples/samples/archived/backup_snippet_test.py b/packages/google-cloud-spanner/samples/samples/archived/backup_snippet_test.py index e1c5251145c9..a6fc712696bd 100644 --- a/packages/google-cloud-spanner/samples/samples/archived/backup_snippet_test.py +++ b/packages/google-cloud-spanner/samples/samples/archived/backup_snippet_test.py @@ -18,12 +18,6 @@ from google.api_core.exceptions import DeadlineExceeded from test_utils.retry import RetryErrors - -@pytest.fixture(scope="module") -def sample_name(): - return "backup" - - def unique_database_id(): """Creates a unique id for the database.""" return f"test-db-{uuid.uuid4().hex[:10]}" diff --git a/packages/google-cloud-spanner/samples/samples/archived/pg_samples_test.py b/packages/google-cloud-spanner/samples/samples/archived/pg_samples_test.py index f64af67e0c34..10ad796be1a1 100644 --- a/packages/google-cloud-spanner/samples/samples/archived/pg_samples_test.py +++ b/packages/google-cloud-spanner/samples/samples/archived/pg_samples_test.py @@ -45,11 +45,6 @@ retry_429 = RetryErrors(exceptions.ResourceExhausted, delay=15) -@pytest.fixture(scope="module") -def sample_name(): - return "pg_snippets" - - @pytest.fixture(scope="module") def database_dialect(): """Spanner dialect to be used for this sample. diff --git a/packages/google-cloud-spanner/samples/samples/archived/samples_test.py b/packages/google-cloud-spanner/samples/samples/archived/samples_test.py index 9a1d5063f76c..051a1e556a40 100644 --- a/packages/google-cloud-spanner/samples/samples/archived/samples_test.py +++ b/packages/google-cloud-spanner/samples/samples/archived/samples_test.py @@ -53,11 +53,6 @@ retry_429 = RetryErrors(exceptions.ResourceExhausted, delay=15) -@pytest.fixture(scope="module") -def sample_name(): - return "snippets" - - @pytest.fixture(scope="module") def database_dialect(): """Spanner dialect to be used for this sample. diff --git a/packages/google-cloud-spanner/samples/samples/autocommit_test.py b/packages/google-cloud-spanner/samples/samples/autocommit_test.py index 8150058f1c90..cf95bab2e038 100644 --- a/packages/google-cloud-spanner/samples/samples/autocommit_test.py +++ b/packages/google-cloud-spanner/samples/samples/autocommit_test.py @@ -11,11 +11,6 @@ import autocommit -@pytest.fixture(scope="module") -def sample_name(): - return "autocommit" - - @RetryErrors(exception=Aborted, max_tries=2) def test_enable_autocommit_mode(capsys, instance_id, sample_database): # Delete table if it exists for retry attempts. diff --git a/packages/google-cloud-spanner/samples/samples/backup_sample_test.py b/packages/google-cloud-spanner/samples/samples/backup_sample_test.py index 7dfb16589b95..e72c9c939faa 100644 --- a/packages/google-cloud-spanner/samples/samples/backup_sample_test.py +++ b/packages/google-cloud-spanner/samples/samples/backup_sample_test.py @@ -20,11 +20,6 @@ import backup_sample -@pytest.fixture(scope="module") -def sample_name(): - return "backup" - - def unique_database_id(): """Creates a unique id for the database.""" return f"test-db-{uuid.uuid4().hex[:10]}" diff --git a/packages/google-cloud-spanner/samples/samples/backup_schedule_samples_test.py b/packages/google-cloud-spanner/samples/samples/backup_schedule_samples_test.py index 8e263b6a4bdf..6fc960aa6714 100644 --- a/packages/google-cloud-spanner/samples/samples/backup_schedule_samples_test.py +++ b/packages/google-cloud-spanner/samples/samples/backup_schedule_samples_test.py @@ -22,11 +22,6 @@ __INCREMENTAL_BACKUP_SCHEDULE_ID = "incremental-backup-schedule" -@pytest.fixture(scope="module") -def sample_name(): - return "backup_schedule" - - @pytest.fixture(scope="module") def database_id(): return f"test-db-{uuid.uuid4().hex[:10]}" diff --git a/packages/google-cloud-spanner/samples/samples/conftest.py b/packages/google-cloud-spanner/samples/samples/conftest.py index c6cb9cbb4c4c..2e5afc1de7fb 100644 --- a/packages/google-cloud-spanner/samples/samples/conftest.py +++ b/packages/google-cloud-spanner/samples/samples/conftest.py @@ -33,17 +33,6 @@ (exceptions.ResourceExhausted, exceptions.FailedPrecondition), max_tries=6, delay=15 ) - -@pytest.fixture(scope="module") -def sample_name(): - """Sample testcase modules must define this fixture. - - The name is used to label the instance created by the sample, to - aid in debugging leaked instances. - """ - raise NotImplementedError("Define 'sample_name' fixture in sample test driver") - - @pytest.fixture(scope="module") def database_dialect(): """Database dialect to be used for this sample. @@ -99,31 +88,31 @@ def cleanup_old_instances(spanner_client): scrub_instance_ignore_not_found(inst) -@pytest.fixture(scope="module") +@pytest.fixture(scope="session") def instance_id(): """Unique id for the instance used in samples.""" return f"test-instance-{uuid.uuid4().hex[:10]}" -@pytest.fixture(scope="module") +@pytest.fixture(scope="session") def multi_region_instance_id(): """Unique id for the multi-region instance used in samples.""" return f"multi-instance-{uuid.uuid4().hex[:10]}" -@pytest.fixture(scope="module") +@pytest.fixture(scope="session") def instance_config(spanner_client): return "{}/instanceConfigs/{}".format( spanner_client.project_name, "regional-us-central1" ) -@pytest.fixture(scope="module") +@pytest.fixture(scope="session") def multi_region_instance_config(spanner_client): return "{}/instanceConfigs/{}".format(spanner_client.project_name, "nam3") -@pytest.fixture(scope="module") +@pytest.fixture(scope="session") def proto_descriptor_file(): import os @@ -134,13 +123,12 @@ def proto_descriptor_file(): file.close() -@pytest.fixture(scope="module") +@pytest.fixture(scope="session") def sample_instance( spanner_client, cleanup_old_instances, instance_id, instance_config, - sample_name, ): operation = spanner_client.instance_admin_api.create_instance( parent=spanner_client.project_name, @@ -151,7 +139,7 @@ def sample_instance( node_count=1, labels={ "cloud_spanner_samples": "true", - "sample_name": sample_name, + "sample_name": "shared-samples", "created": str(int(time.time())), }, edition=spanner_instance_admin.Instance.Edition.ENTERPRISE_PLUS, # Optional @@ -170,20 +158,19 @@ def sample_instance( scrub_instance_ignore_not_found(sample_instance) -@pytest.fixture(scope="module") +@pytest.fixture(scope="session") def multi_region_instance( spanner_client, cleanup_old_instances, multi_region_instance_id, multi_region_instance_config, - sample_name, ): multi_region_instance = spanner_client.instance( multi_region_instance_id, multi_region_instance_config, labels={ "cloud_spanner_samples": "true", - "sample_name": sample_name, + "sample_name": "shared-samples", "created": str(int(time.time())), }, ) @@ -205,7 +192,7 @@ def database_id(): Sample testcase modules can override as needed. """ - return "my-database-id" + return f"my-db-{uuid.uuid4().hex[:10]}" @pytest.fixture(scope="module") diff --git a/packages/google-cloud-spanner/samples/samples/graph_snippets_test.py b/packages/google-cloud-spanner/samples/samples/graph_snippets_test.py index 70e14e21ac84..23a8cb687e78 100644 --- a/packages/google-cloud-spanner/samples/samples/graph_snippets_test.py +++ b/packages/google-cloud-spanner/samples/samples/graph_snippets_test.py @@ -80,12 +80,6 @@ LABEL Transfers) """ - -@pytest.fixture(scope="module") -def sample_name(): - return "snippets" - - @pytest.fixture(scope="module") def database_dialect(): """Spanner dialect to be used for this sample. diff --git a/packages/google-cloud-spanner/samples/samples/pg_snippets_test.py b/packages/google-cloud-spanner/samples/samples/pg_snippets_test.py index 57f053605bcc..4b09180f6870 100644 --- a/packages/google-cloud-spanner/samples/samples/pg_snippets_test.py +++ b/packages/google-cloud-spanner/samples/samples/pg_snippets_test.py @@ -46,11 +46,6 @@ retry_429 = RetryErrors(exceptions.ResourceExhausted, delay=15) -@pytest.fixture(scope="module") -def sample_name(): - return "pg_snippets" - - @pytest.fixture(scope="module") def database_dialect(): """Spanner dialect to be used for this sample. diff --git a/packages/google-cloud-spanner/samples/samples/quickstart_test.py b/packages/google-cloud-spanner/samples/samples/quickstart_test.py index 3726e7aef69c..3b1e31b27867 100644 --- a/packages/google-cloud-spanner/samples/samples/quickstart_test.py +++ b/packages/google-cloud-spanner/samples/samples/quickstart_test.py @@ -17,11 +17,6 @@ import quickstart -@pytest.fixture(scope="module") -def sample_name(): - return "quickstart" - - def test_quickstart(capsys, instance_id, sample_database): quickstart.run_quickstart(instance_id, sample_database.database_id) out, _ = capsys.readouterr() diff --git a/packages/google-cloud-spanner/samples/samples/snippets_test.py b/packages/google-cloud-spanner/samples/samples/snippets_test.py index 3b0c6990beab..12f2ccd87a23 100644 --- a/packages/google-cloud-spanner/samples/samples/snippets_test.py +++ b/packages/google-cloud-spanner/samples/samples/snippets_test.py @@ -55,11 +55,6 @@ retry_429 = RetryErrors(exceptions.ResourceExhausted, delay=15) -@pytest.fixture(scope="module") -def sample_name(): - return "snippets" - - @pytest.fixture(scope="module") def database_dialect(): """Spanner dialect to be used for this sample.