diff --git a/.travis.yml b/.travis.yml index f2873ddbb..c3de9f6c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ dist: xenial jobs: fast_finish: true include: - - stage: baseline + - stage: test python: 3.6 env: - TOXENV=py36-dj20-postgres-xdist-coverage @@ -21,8 +21,7 @@ jobs: - python: 3.6 env: TOXENV=checkqa,docs - - stage: test - python: 3.7 + - python: 3.7 env: TOXENV=py37-dj21-sqlite-coverage - python: 3.7 env: TOXENV=py37-dj22-sqlite-xdist-coverage diff --git a/pytest_django/live_server_helper.py b/pytest_django/live_server_helper.py index 94ded3315..b3067c765 100644 --- a/pytest_django/live_server_helper.py +++ b/pytest_django/live_server_helper.py @@ -23,6 +23,7 @@ def __init__(self, addr): conn.settings_dict["ENGINE"] == "django.db.backends.sqlite3" and conn.settings_dict["NAME"] == ":memory:" ): + assert 0 # Explicitly enable thread-shareability for this connection conn.allow_thread_sharing = True connections_override[conn.alias] = conn