|
33 | 33 |
|
34 | 34 |
|
35 | 35 | @pytest.fixture(scope="session")
|
36 |
| -def django_db_modify_db_settings_xdist_suffix(request): |
| 36 | +def django_db_modify_db_settings_tox_suffix(request): |
37 | 37 | skip_if_no_django()
|
38 | 38 |
|
39 |
| - from django.conf import settings |
| 39 | + tox_environment = os.environ.get("TOX_PARALLEL_ENV") |
| 40 | + if tox_environment: |
| 41 | + # Put a suffix like _py27-django21 on tox workers |
| 42 | + _set_suffix_to_test_databases(suffix=tox_environment) |
40 | 43 |
|
41 |
| - for db_settings in settings.DATABASES.values(): |
42 |
| - |
43 |
| - try: |
44 |
| - test_name = db_settings["TEST"]["NAME"] |
45 |
| - except KeyError: |
46 |
| - test_name = None |
47 | 44 |
|
48 |
| - if not test_name: |
49 |
| - if db_settings["ENGINE"] == "django.db.backends.sqlite3": |
50 |
| - return ":memory:" |
51 |
| - else: |
52 |
| - test_name = "test_{}".format(db_settings["NAME"]) |
| 45 | +@pytest.fixture(scope="session") |
| 46 | +def django_db_modify_db_settings_xdist_suffix(request): |
| 47 | + skip_if_no_django() |
53 | 48 |
|
| 49 | + xdist_suffix = getattr(request.config, "slaveinput", {}).get("slaveid") |
| 50 | + if xdist_suffix: |
54 | 51 | # Put a suffix like _gw0, _gw1 etc on xdist processes
|
55 |
| - xdist_suffix = getattr(request.config, "slaveinput", {}).get("slaveid") |
56 |
| - if test_name != ":memory:" and xdist_suffix is not None: |
57 |
| - test_name = "{}_{}".format(test_name, xdist_suffix) |
| 52 | + _set_suffix_to_test_databases(suffix=xdist_suffix) |
58 | 53 |
|
59 |
| - db_settings.setdefault("TEST", {}) |
60 |
| - db_settings["TEST"]["NAME"] = test_name |
| 54 | + |
| 55 | +@pytest.fixture(scope="session") |
| 56 | +def django_db_modify_db_settings_parallel_suffix( |
| 57 | + django_db_modify_db_settings_tox_suffix, |
| 58 | + django_db_modify_db_settings_xdist_suffix, |
| 59 | +): |
| 60 | + skip_if_no_django() |
61 | 61 |
|
62 | 62 |
|
63 | 63 | @pytest.fixture(scope="session")
|
64 |
| -def django_db_modify_db_settings(django_db_modify_db_settings_xdist_suffix): |
| 64 | +def django_db_modify_db_settings(django_db_modify_db_settings_parallel_suffix): |
65 | 65 | skip_if_no_django()
|
66 | 66 |
|
67 | 67 |
|
@@ -153,6 +153,31 @@ def _disable_native_migrations():
|
153 | 153 | settings.MIGRATION_MODULES = DisableMigrations()
|
154 | 154 |
|
155 | 155 |
|
| 156 | +def _set_suffix_to_test_databases(suffix): |
| 157 | + if not suffix: |
| 158 | + return |
| 159 | + |
| 160 | + from django.conf import settings |
| 161 | + |
| 162 | + for db_settings in settings.DATABASES.values(): |
| 163 | + |
| 164 | + try: |
| 165 | + test_name = db_settings["TEST"]["NAME"] |
| 166 | + except KeyError: |
| 167 | + test_name = None |
| 168 | + |
| 169 | + if not test_name: |
| 170 | + if db_settings["ENGINE"] == "django.db.backends.sqlite3": |
| 171 | + continue |
| 172 | + test_name = "test_{}".format(db_settings["NAME"]) |
| 173 | + |
| 174 | + if test_name == ":memory:": |
| 175 | + continue |
| 176 | + |
| 177 | + db_settings.setdefault("TEST", {}) |
| 178 | + db_settings["TEST"]["NAME"] = "{}_{}".format(test_name, suffix) |
| 179 | + |
| 180 | + |
156 | 181 | # ############### User visible fixtures ################
|
157 | 182 |
|
158 | 183 |
|
|
0 commit comments