googleapis · jimfulton · May 13, 2021 · Apr 12, 2021 · Apr 15, 2021 · Apr 15, 2021
diff --git a/noxfile.py b/noxfile.py
@@ -212,11 +212,10 @@ def compliance(session):
         f"--junitxml=compliance_{session.python}_sponge_log.xml",
         "--reruns=3",
         "--reruns-delay=60",
-        "--only-rerun="
-        "403 Exceeded rate limits|"
-        "409 Already Exists|"
-        "404 Not found|"
-        "400 Cannot execute DML over a non-existent table",
+        "--only-rerun=403 Exceeded rate limits",
+        "--only-rerun=409 Already Exists",
+        "--only-rerun=404 Not found",
+        "--only-rerun=400 Cannot execute DML over a non-existent table",
         system_test_folder_path,
         *session.posargs,
     )

diff --git a/pybigquery/requirements.py b/pybigquery/requirements.py
@@ -134,7 +134,7 @@ def schemas(self):
         """Target database must support external schemas, and have one
         named 'test_schema'."""
 
-        return supported()
+        return unsupported()
 
     @property
     def implicit_default_schema(self):
@@ -218,3 +218,15 @@ def order_by_label_with_expression(self):
 
         """
         return supported()
+
+
+class WithSchemas(Requirements):
+    """
+    Option to run without schema tests
+
+    because the `test_schema` name can't be overridden.
+    """
+
+    @property
+    def schemas(self):
+        return supported()
diff --git a/setup.cfg b/setup.cfg
@@ -22,9 +22,6 @@ universal = 1
 requirement_cls=pybigquery.requirements:Requirements
 profile_file=sqlalchemy_dialect_compliance-profiles.txt
 
-[db]
-default=bigquery:///test_pybigquery_sqla
-
 [tool:pytest]
 addopts= --tb native -v -r fxX -p no:warnings
 python_files=tests/*test_*.py
diff --git a/tests/sqlalchemy_dialect_compliance/README.rst b/tests/sqlalchemy_dialect_compliance/README.rst
@@ -1,3 +1,4 @@
+==================================
 SQLAlchemy Dialog Compliance Tests
 ==================================
 

diff --git a/tests/sqlalchemy_dialect_compliance/conftest.py b/tests/sqlalchemy_dialect_compliance/conftest.py
@@ -17,15 +17,20 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+import contextlib
+import random
+import traceback
+
+import sqlalchemy
+from sqlalchemy.testing import config
 from sqlalchemy.testing.plugin.pytestplugin import *  # noqa
 from sqlalchemy.testing.plugin.pytestplugin import (
     pytest_sessionstart as _pytest_sessionstart,
+    pytest_sessionfinish as _pytest_sessionfinish,
 )
 
 import google.cloud.bigquery.dbapi.connection
 import pybigquery.sqlalchemy_bigquery
-import sqlalchemy
-import traceback
 
 pybigquery.sqlalchemy_bigquery.BigQueryDialect.preexecute_autoincrement_sequences = True
 google.cloud.bigquery.dbapi.connection.Connection.rollback = lambda self: None
@@ -51,18 +56,16 @@ def visit_delete(self, delete_stmt, *args, **kw):
 pybigquery.sqlalchemy_bigquery.BigQueryCompiler.visit_delete = visit_delete
 
 
-# Clean up test schemas so we don't get spurious errors when the tests
-# try to create tables that already exist.
 def pytest_sessionstart(session):
-    client = google.cloud.bigquery.Client()
-    for schema in "test_schema", "test_pybigquery_sqla":
-        for table_item in client.list_tables(f"{client.project}.{schema}"):
-            table_id = table_item.table_id
-            list(
-                client.query(
-                    f"drop {'view' if table_id.endswith('_v') else 'table'}"
-                    f" {schema}.{table_id}"
-                ).result()
-            )
-    client.close()
+    dataset_id = f"test_pybigquery_sqla{random.randint(0, 1<<63)}"
+    session.config.option.dburi = [f"bigquery:///{dataset_id}"]
+    with contextlib.closing(google.cloud.bigquery.Client()) as client:
+        client.create_dataset(dataset_id)
     _pytest_sessionstart(session)
+
+
+def pytest_sessionfinish(session):
+    dataset_id = config.db.dialect.dataset_id
+    _pytest_sessionfinish(session)
+    with contextlib.closing(google.cloud.bigquery.Client()) as client:
+        client.delete_dataset(dataset_id, delete_contents=True)