From 2de7eb6f4d5a20cec98e4d2eefc276ee38d149ad Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Wed, 23 Jan 2019 10:20:25 -0500
Subject: [PATCH] Refs #30111 -- Fixed test cleanup in
 postgres_tests/test_integration.py.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed "ERROR: Step ‘Publish JUnit test result report’ failed: No test report
files were found. Configuration error?" on Jenkins because report files were
put in tests/postgres_tests.
---
 tests/postgres_tests/test_integration.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/postgres_tests/test_integration.py b/tests/postgres_tests/test_integration.py
index 829b862027..277001d31f 100644
--- a/tests/postgres_tests/test_integration.py
+++ b/tests/postgres_tests/test_integration.py
@@ -2,11 +2,13 @@ import os
 import subprocess
 import sys
 
-from tests.postgres_tests import PostgreSQLSimpleTestCase
+from . import PostgreSQLSimpleTestCase
 
 
 class PostgresIntegrationTests(PostgreSQLSimpleTestCase):
     def test_check(self):
+        old_cwd = os.getcwd()
+        self.addCleanup(lambda: os.chdir(old_cwd))
         os.chdir(os.path.dirname(__file__))
         result = subprocess.run(
             [sys.executable, '-m', 'django', 'check', '--settings', 'integration_settings'],