From 909dc81261990ba3b3d723e33cacb64b58a53f32 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 30 May 2019 19:28:29 +0200 Subject: [PATCH] tests: fix test_sqlite_database_renamed for Django 1.11 (#739) * tests: fix test_sqlite_database_renamed for Django 1.11 Ref: https://github.com/django/django/blob/1.11.20/django/db/backends/sqlite3/creation.py#L19 Fixes https://github.com/pytest-dev/pytest-django/issues/712. * ci: Travis: test py27-dj111-sqlite-xdist --- .travis.yml | 6 +++--- tests/test_db_setup.py | 5 ++++- tox.ini | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f68bd819..9011cf891 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,11 +10,11 @@ jobs: services: - postgresql - python: 3.6 - env: TOXENV=py36-dj111-sqlite-coverage - - python: 2.7 - env: TOXENV=py27-dj111-mysql_innodb-coverage + env: TOXENV=py36-dj111-mysql_innodb-coverage services: - mysql + - python: 2.7 + env: TOXENV=py27-dj111-sqlite-xdist-coverage - python: 3.6 env: TOXENV=checkqa,docs diff --git a/tests/test_db_setup.py b/tests/test_db_setup.py index b5fc78b26..cc8353c08 100644 --- a/tests/test_db_setup.py +++ b/tests/test_db_setup.py @@ -278,7 +278,10 @@ def test_a(): assert conn_default.vendor == 'sqlite' db_name = conn_default.creation._get_test_db_name() - assert 'file:memorydb' in db_name + if conn_default.features.can_share_in_memory_db: + assert 'file:memorydb' in db_name + else: + assert db_name == ":memory:" assert conn_db2.vendor == 'sqlite' db_name = conn_db2.creation._get_test_db_name() diff --git a/tox.ini b/tox.ini index ad71b6c54..37b1bc398 100644 --- a/tox.ini +++ b/tox.ini @@ -19,8 +19,8 @@ deps = dj19: Django>=1.9,<1.10 dj18: Django>=1.8,<1.9 - mysql_myisam: mysql-python==1.2.5 - mysql_innodb: mysql-python==1.2.5 + mysql_myisam: mysqlclient==1.4.2.post1 + mysql_innodb: mysqlclient==1.4.2.post1 postgres: psycopg2-binary coverage: coverage-enable-subprocess