From d3294845347a61b085e9757c757e4290979e1d10 Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Tue, 14 May 2019 19:43:56 +0200 Subject: [PATCH] Ensured that our django checkout is in the pythonpath during tests. This fixes an issue with postgres_tests.test_integration.PostgresIntegrationTests which would not find Django in a CI run. --- tests/postgres_tests/test_integration.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/postgres_tests/test_integration.py b/tests/postgres_tests/test_integration.py index 20abf54e563..da3ccb028dd 100644 --- a/tests/postgres_tests/test_integration.py +++ b/tests/postgres_tests/test_integration.py @@ -7,11 +7,16 @@ from . import PostgreSQLSimpleTestCase class PostgresIntegrationTests(PostgreSQLSimpleTestCase): def test_check(self): + test_environ = os.environ.copy() + if 'DJANGO_SETTINGS_MODULE' in test_environ: + del test_environ['DJANGO_SETTINGS_MODULE'] + test_environ['PYTHONPATH'] = os.path.join(os.path.dirname(__file__), '../../') result = subprocess.run( [sys.executable, '-m', 'django', 'check', '--settings', 'integration_settings'], stdout=subprocess.DEVNULL, stderr=subprocess.PIPE, cwd=os.path.dirname(__file__), + env=test_environ ) stderr = '\n'.join([e.decode() for e in result.stderr.splitlines()]) self.assertEqual(result.returncode, 0, msg=stderr)