innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Refs #32178 -- Fixed test_mark_expected_failures_and_skips_call teardown. 

Test isolation failure observed on CockroachDB and PostgreSQL.
This commit is contained in:
Tim Graham 2020-12-11 15:06:33 -05:00 committed by GitHub
parent 8d7085e0fd
commit 1e7653117f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/backends/base/test_creation.py
View File

@ -120,9 +120,14 @@ class TestDbCreationTests(SimpleTestCase):
if connection.vendor == 'oracle': if connection.vendor == 'oracle':
# Don't close connection on Oracle. # Don't close connection on Oracle.
creation.connection.close = mock.Mock() creation.connection.close = mock.Mock()
with mock.patch.object(creation, '_create_test_db'): old_database_name = test_connection.settings_dict['NAME']
creation.create_test_db(verbosity=0, autoclobber=True, serialize=False) try:
self.assertIs(mark_expected_failures_and_skips.called, False) with mock.patch.object(creation, '_create_test_db'):
creation.create_test_db(verbosity=0, autoclobber=True, serialize=False)
self.assertIs(mark_expected_failures_and_skips.called, False)
finally:
with mock.patch.object(creation, '_destroy_test_db'):
creation.destroy_test_db(old_database_name, verbosity=0)
class TestDeserializeDbFromString(TransactionTestCase): class TestDeserializeDbFromString(TransactionTestCase):