test: Use named db in system tests

rwhogg · rwhogg · commit 29555fe03275 · 2023-01-23T16:47:16.000Z
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -174,6 +174,7 @@ Running System Tests
 
 - You'll also need stored data in your dataset. To populate this data, run::
 
+   $ export SYSTEM_TESTS_DATABASE=test-db
    $ python tests/system/utils/populate_datastore.py
 
 - If you make a mistake during development (i.e. a failing test that
diff --git a/noxfile.py b/noxfile.py
@@ -230,7 +230,8 @@ def install_systemtest_dependencies(session, *constraints):
 
 @nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
 @nox.parametrize("disable_grpc", [False, True])
-def system(session, disable_grpc):
+@nox.parametrize("use_named_db", [False, True])
+def system(session, disable_grpc, use_named_db):
     """Run the system test suite."""
     constraints_path = str(
         CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
@@ -256,6 +257,7 @@ def system(session, disable_grpc):
     env = {}
     if disable_grpc:
         env["GOOGLE_CLOUD_DISABLE_GRPC"] = "True"
+    env["SYSTEM_TESTS_DATABASE"] = "test-db" if use_named_db else ""
 
     # Run py.test against the system tests.
     if system_test_exists:
diff --git a/owlbot.py b/owlbot.py
@@ -120,7 +120,8 @@ def system\(session\):
     """\
 @nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
 @nox.parametrize("disable_grpc", [False, True])
-def system(session, disable_grpc):
+@nox.parametrize("use_named_db", [False, True])
+def system(session, disable_grpc, use_named_db):
 """,
 )
 
@@ -133,6 +134,7 @@ def system(session, disable_grpc):
     env = {}
     if disable_grpc:
         env["GOOGLE_CLOUD_DISABLE_GRPC"] = "True"
+    env["SYSTEM_TESTS_DATABASE"] = "system-tests-named-db" if use_named_db else ""
 
 # Run py.test against the system tests.
 """,
diff --git a/tests/system/_helpers.py b/tests/system/_helpers.py
@@ -18,7 +18,9 @@
 from google.cloud.datastore.client import DATASTORE_DATASET
 from test_utils.system import unique_resource_id
 
+_DATASTORE_DATABASE = "SYSTEM_TESTS_DATABASE"
 EMULATOR_DATASET = os.getenv(DATASTORE_DATASET)
+EMULATOR_DATABASE = os.getenv(_DATASTORE_DATABASE)
 
 
 def unique_id(prefix, separator="-"):
diff --git a/tests/system/utils/clear_datastore.py b/tests/system/utils/clear_datastore.py
@@ -85,14 +85,18 @@ def remove_all_entities(client):
     client.delete_multi(keys)
 
 
-def main():
-    client = datastore.Client()
+def run(database):
+    client = datastore.Client(database=database)
     kinds = sys.argv[1:]
 
     if len(kinds) == 0:
         kinds = ALL_KINDS
 
-    print_func("This command will remove all entities for " "the following kinds:")
+    print_func(
+        "This command will remove all entities from the database"
+        + database
+        + " for the following kinds:"
+    )
     print_func("\n".join("- " + val for val in kinds))
     response = input("Is this OK [y/n]? ")
 
@@ -105,5 +109,10 @@ def main():
         print_func("Doing nothing.")
 
 
+def main():
+    for database in ["", "test-db"]:
+        run(database)
+
+
 if __name__ == "__main__":
     main()
diff --git a/tests/system/utils/populate_datastore.py b/tests/system/utils/populate_datastore.py
@@ -175,8 +175,8 @@ def add_timestamp_keys(client=None):
                 batch.put(entity)
 
 
-def main():
-    client = datastore.Client()
+def run(database):
+    client = datastore.Client(database=database)
     flags = sys.argv[1:]
 
     if len(flags) == 0:
@@ -192,5 +192,10 @@ def main():
         add_timestamp_keys(client)
 
 
+def main():
+    for database in ["", "test-db"]:
+        run(database)
+
+
 if __name__ == "__main__":
     main()
