Fix most tests for previous Django and Python versions

This commit is contained in:
David Wobrock committed 2020-07-02 19:15:30 +02:00
1 parent ef38433bb8
commit ae84a5ffad
2 files changed
+19 -13

No files matched your search

+1
View File
@@ -44,6 +44,7 @@ setup(
"psycopg2-binary>=2.8.5", "psycopg2-binary>=2.8.5",
"django_add_default_value>=0.4.0", "django_add_default_value>=0.4.0",
'mock>=3.0.5;python_version<"3.3"', 'mock>=3.0.5;python_version<"3.3"',
'backports.tempfile>=1.0;python_version<="2.7"',
] ]
}, },
keywords="django migration lint linter database backward compatibility", keywords="django migration lint linter database backward compatibility",
+18 -13
View File
@@ -1,8 +1,6 @@
import io
import os import os
import shutil import shutil
import sys import sys
import tempfile
from contextlib import contextmanager from contextlib import contextmanager
from importlib import import_module from importlib import import_module
@@ -11,6 +9,13 @@ if sys.version_info >= (3, 3):
else: else:
import mock import mock
if sys.version_info.major >= 3:
import tempfile
from io import StringIO as StringIO
else:
from backports import tempfile
from io import BytesIO as StringIO
from django.apps import apps from django.apps import apps
from django.conf import settings from django.conf import settings
from django.core.management import call_command from django.core.management import call_command
@@ -68,7 +73,7 @@ class MakeMigrationsCorrectTestCase(BaseMakeMigrationsTestCase):
databases = {"default", "postgresql"} databases = {"default", "postgresql"}
def test_correct_linted_makemigrations(self): def test_correct_linted_makemigrations(self):
out = io.StringIO() out = StringIO()
with self.temporary_migration_module( with self.temporary_migration_module(
app_label="makemigrations_correct_migration_missing" app_label="makemigrations_correct_migration_missing"
) as migration_dir: ) as migration_dir:
@@ -80,7 +85,7 @@ class MakeMigrationsCorrectTestCase(BaseMakeMigrationsTestCase):
@override_settings(MIGRATION_LINTER_OVERRIDE_MAKEMIGRATIONS=True) @override_settings(MIGRATION_LINTER_OVERRIDE_MAKEMIGRATIONS=True)
def test_correct_linted_makemigrations_using_settings(self): def test_correct_linted_makemigrations_using_settings(self):
out = io.StringIO() out = StringIO()
with self.temporary_migration_module( with self.temporary_migration_module(
app_label="makemigrations_correct_migration_missing" app_label="makemigrations_correct_migration_missing"
) as migration_dir: ) as migration_dir:
@@ -91,7 +96,7 @@ class MakeMigrationsCorrectTestCase(BaseMakeMigrationsTestCase):
self.assertIn("Linting for 'makemigrations_correct_migration_missing':", output) self.assertIn("Linting for 'makemigrations_correct_migration_missing':", output)
def test_no_linting_when_no_option(self): def test_no_linting_when_no_option(self):
out = io.StringIO() out = StringIO()
with self.temporary_migration_module( with self.temporary_migration_module(
app_label="makemigrations_correct_migration_missing" app_label="makemigrations_correct_migration_missing"
) as migration_dir: ) as migration_dir:
@@ -102,7 +107,7 @@ class MakeMigrationsCorrectTestCase(BaseMakeMigrationsTestCase):
self.assertNotIn("Linting", output) self.assertNotIn("Linting", output)
def test_correct_linted_makemigrations_dry_run(self): def test_correct_linted_makemigrations_dry_run(self):
out = io.StringIO() out = StringIO()
with self.temporary_migration_module( with self.temporary_migration_module(
app_label="makemigrations_correct_migration_missing" app_label="makemigrations_correct_migration_missing"
) as migration_dir: ) as migration_dir:
@@ -128,7 +133,7 @@ class MakeMigrationsBackwardIncompatibleTestCase(BaseMakeMigrationsTestCase):
databases = {"default", "sqlite", "mysql", "postgresql"} databases = {"default", "sqlite", "mysql", "postgresql"}
def test_backward_incompatible_migration_postgresql(self): def test_backward_incompatible_migration_postgresql(self):
out = io.StringIO() out = StringIO()
with self.temporary_migration_module( with self.temporary_migration_module(
app_label="makemigrations_backward_incompatible_migration_missing" app_label="makemigrations_backward_incompatible_migration_missing"
) as migration_dir: ) as migration_dir:
@@ -141,7 +146,7 @@ class MakeMigrationsBackwardIncompatibleTestCase(BaseMakeMigrationsTestCase):
self.assertIn("Deleted", output) self.assertIn("Deleted", output)
def test_backward_incompatible_migration_mysql(self): def test_backward_incompatible_migration_mysql(self):
out = io.StringIO() out = StringIO()
with self.temporary_migration_module( with self.temporary_migration_module(
app_label="makemigrations_backward_incompatible_migration_missing" app_label="makemigrations_backward_incompatible_migration_missing"
) as migration_dir: ) as migration_dir:
@@ -154,7 +159,7 @@ class MakeMigrationsBackwardIncompatibleTestCase(BaseMakeMigrationsTestCase):
self.assertIn("Deleted", output) self.assertIn("Deleted", output)
def test_backward_incompatible_migration_sqlite(self): def test_backward_incompatible_migration_sqlite(self):
out = io.StringIO() out = StringIO()
with self.temporary_migration_module( with self.temporary_migration_module(
app_label="makemigrations_backward_incompatible_migration_missing" app_label="makemigrations_backward_incompatible_migration_missing"
) as migration_dir: ) as migration_dir:
@@ -166,9 +171,9 @@ class MakeMigrationsBackwardIncompatibleTestCase(BaseMakeMigrationsTestCase):
output = out.getvalue() output = out.getvalue()
self.assertIn("Deleted", output) self.assertIn("Deleted", output)
@mock.patch("builtins.input", return_value="yes") @mock.patch("django.db.migrations.questioner.input", return_value="yes")
def test_backward_incompatible_migration_interactive_keep_migration(self, *args): def test_backward_incompatible_migration_interactive_keep_migration(self, *args):
out = io.StringIO() out = StringIO()
with self.temporary_migration_module( with self.temporary_migration_module(
app_label="makemigrations_backward_incompatible_migration_missing" app_label="makemigrations_backward_incompatible_migration_missing"
) as migration_dir: ) as migration_dir:
@@ -180,9 +185,9 @@ class MakeMigrationsBackwardIncompatibleTestCase(BaseMakeMigrationsTestCase):
output = out.getvalue() output = out.getvalue()
self.assertNotIn("Deleted", output) self.assertNotIn("Deleted", output)
@mock.patch("builtins.input", return_value="no") @mock.patch("django.db.migrations.questioner.input", return_value="no")
def test_backward_incompatible_migration_interactive_delete_migration(self, *args): def test_backward_incompatible_migration_interactive_delete_migration(self, *args):
out = io.StringIO() out = StringIO()
with self.temporary_migration_module( with self.temporary_migration_module(
app_label="makemigrations_backward_incompatible_migration_missing" app_label="makemigrations_backward_incompatible_migration_missing"
) as migration_dir: ) as migration_dir: