Move LEAVE_DB across to tests.server

Author: reivilibre

tests/server.py

@@ -14,6 +14,7 @@
 import hashlib
 import json
 import logging
+import os
 import time
 import uuid
 import warnings
@@ -66,7 +67,6 @@
 from synapse.util import Clock
 
 from tests.utils import (
-    LEAVE_DB,
     POSTGRES_BASE_DB,
     POSTGRES_HOST,
     POSTGRES_PASSWORD,
@@ -79,6 +79,9 @@
 logger = logging.getLogger(__name__)
 
 
+LEAVE_DB = os.environ.get("SYNAPSE_LEAVE_DB", False)
+
+
 class TimedOutException(Exception):
     """
     A web query timed out.

tests/utils.py

@@ -36,7 +36,6 @@
 # POSTGRES_BASE_DB and update it to the current schema. Then, for each test case, we
 # create another unique database, using the base database as a template.
 USE_POSTGRES_FOR_TESTS = os.environ.get("SYNAPSE_POSTGRES", False)
-LEAVE_DB = os.environ.get("SYNAPSE_LEAVE_DB", False)
 POSTGRES_USER = os.environ.get("SYNAPSE_POSTGRES_USER", None)
 POSTGRES_HOST = os.environ.get("SYNAPSE_POSTGRES_HOST", None)
 POSTGRES_PASSWORD = os.environ.get("SYNAPSE_POSTGRES_PASSWORD", None)