tests: fix db_helpers.drop_database: use suffix; cleanup (#812)

* tests: fix db_helpers.drop_database: use suffix

`test_xdist_with_reuse` uses `drop_database("gw0")`, where `"gw0"` is
meant to be a suffix, not the whole name.

* test_xdist_with_reuse: cleanup DBs

Author: blueyed

pytest_django_test/db_helpers.py

@@ -61,7 +61,15 @@ def skip_if_sqlite_in_memory():
         pytest.skip("Do not test db reuse since database does not support it")
 
 
-def drop_database(name=TEST_DB_NAME):
+def _get_db_name(db_suffix=None):
+    name = TEST_DB_NAME
+    if db_suffix:
+        name = "%s_%s" % (name, db_suffix)
+    return name
+
+
+def drop_database(db_suffix=None):
+    name = _get_db_name(db_suffix)
     db_engine = get_db_engine()
 
     if db_engine == "postgresql_psycopg2":
@@ -83,12 +91,9 @@ def drop_database(name=TEST_DB_NAME):
 
 
 def db_exists(db_suffix=None):
-    name = TEST_DB_NAME
+    name = _get_db_name(db_suffix)
     db_engine = get_db_engine()
 
-    if db_suffix:
-        name = "%s_%s" % (name, db_suffix)
-
     if db_engine == "postgresql_psycopg2":
         r = run_cmd("psql", name, "-c", "SELECT 1")
         return r.status_code == 0

tests/test_db_setup.py

@@ -152,6 +152,8 @@ def test_xdist_with_reuse(django_testdir):
 
     drop_database("gw0")
     drop_database("gw1")
+    assert not db_exists("gw0")
+    assert not db_exists("gw1")
 
     django_testdir.create_test_module(
         """
@@ -214,6 +216,10 @@ def test_d(settings):
     result.stdout.fnmatch_lines(["*PASSED*test_c*"])
     result.stdout.fnmatch_lines(["*PASSED*test_d*"])
 
+    # Cleanup.
+    drop_database("gw0")
+    drop_database("gw1")
+
 
 class TestSqliteWithXdist: