Update Tests:

* don't use the project fixtures anymore but the one Django project
* update and refactor cache tests to be less brittle
* explicitly test mysql, postgresql and sqlite3 databases
* remove 'multiple_call' tests since it is not possible anymore
(with the Django singleton)
* update Travis and tox (dropping Python 3.4)

tests/unit/test_linter.py

@@ -13,85 +13,63 @@
 # limitations under the License.
 
 import unittest
-import os
+
+from django.db.migrations import Migration
 
 from django_migration_linter import MigrationLinter
-from django_migration_linter.migration import Migration
-from tests import fixtures
 
 
-class TestLinterFunctions(unittest.TestCase):
+class LinterFunctionsTestCase(unittest.TestCase):
     def test_get_sql(self):
-        project_path = fixtures.ADD_NOT_NULL_COLUMN_PROJECT
-        linter = MigrationLinter(project_path)
-        sql_statements = linter.get_sql('test_app', '0001')
+        linter = MigrationLinter()
+        sql_statements = linter.get_sql("app_add_not_null_column", "0001")
         self.assertEqual(len(sql_statements), 6)
-        self.assertEqual(sql_statements[0], 'BEGIN;')
-        self.assertEqual(sql_statements[-1], 'COMMIT;')
+        self.assertEqual(sql_statements[0], "BEGIN;")
+        self.assertEqual(sql_statements[-1], "COMMIT;")
 
     def test_has_errors(self):
-        project_path = fixtures.MULTI_COMMIT_PROJECT
-        linter = MigrationLinter(project_path)
+        linter = MigrationLinter()
         self.assertFalse(linter.has_errors)
 
-        m = Migration(os.path.join(project_path, 'test_app/migrations/0001_create_table.py'))
+        m = Migration("0001_create_table", "app_add_not_null_column")
         linter.lint_migration(m)
         self.assertFalse(linter.has_errors)
 
-        m = Migration(os.path.join(project_path, 'test_app/migrations/0002_add_new_not_null_field.py'))
+        m = Migration("0002_add_new_not_null_field", "app_add_not_null_column")
         linter.lint_migration(m)
         self.assertTrue(linter.has_errors)
 
-        m = Migration(os.path.join(project_path, 'test_app/migrations/0001_create_table.py'))
+        m = Migration("0001_create_table", "app_add_not_null_column")
         linter.lint_migration(m)
         self.assertTrue(linter.has_errors)
 
-    def test_linter_creation(self):
-        with self.assertRaises(ValueError):
-            MigrationLinter('foo/')
-        with self.assertRaises(ValueError):
-            MigrationLinter('/dev/null')
-        with self.assertRaises(ValueError):
-            MigrationLinter(fixtures.NOT_DJANGO_GIT_PROJECT)
-
     def test_ignore_migration_include_apps(self):
-        linter = MigrationLinter(
-            fixtures.ADD_NOT_NULL_COLUMN_PROJECT,
-            include_apps=('test_app2',))
-        self.assertTrue(linter.should_ignore_migration('test_app1', '0001'))
-        self.assertFalse(linter.should_ignore_migration('test_app2', '0001'))
+        linter = MigrationLinter(include_apps=("app_add_not_null_column",))
+        self.assertTrue(linter.should_ignore_migration("app_correct", "0001"))
+        self.assertTrue(linter.should_ignore_migration("app_correct", "0002"))
+        self.assertFalse(
+            linter.should_ignore_migration("app_add_not_null_column", "0001")
+        )
 
     def test_ignore_migration_exclude_apps(self):
-        linter = MigrationLinter(
-            fixtures.ADD_NOT_NULL_COLUMN_PROJECT,
-            exclude_apps=('test_app1',))
-        self.assertTrue(linter.should_ignore_migration('test_app1', '0001'))
-        self.assertFalse(linter.should_ignore_migration('test_app2', '0001'))
+        linter = MigrationLinter(exclude_apps=("app_add_not_null_column",))
+        self.assertFalse(linter.should_ignore_migration("app_correct", "0001"))
+        self.assertFalse(linter.should_ignore_migration("app_correct", "0002"))
+        self.assertTrue(
+            linter.should_ignore_migration("app_add_not_null_column", "0001")
+        )
 
     def test_ignore_migration_name_contains(self):
-        linter = MigrationLinter(
-            fixtures.ADD_NOT_NULL_COLUMN_PROJECT,
-            ignore_name_contains='foo')
-        self.assertTrue(linter.should_ignore_migration('test_app', '0001_foo'))
-        self.assertFalse(linter.should_ignore_migration('test_app', '0002_bar'))
+        linter = MigrationLinter(ignore_name_contains="foo")
+        self.assertFalse(linter.should_ignore_migration("app_correct", "0001_initial"))
+        self.assertTrue(linter.should_ignore_migration("app_correct", "0002_foo"))
 
     def test_ignore_migration_full_name(self):
-        linter = MigrationLinter(
-            fixtures.ADD_NOT_NULL_COLUMN_PROJECT,
-            ignore_name=('0001_foo',))
-        self.assertTrue(linter.should_ignore_migration('test_app', '0001_foo'))
-        self.assertFalse(linter.should_ignore_migration('test_app', '0002_bar'))
+        linter = MigrationLinter(ignore_name=("0002_foo",))
+        self.assertFalse(linter.should_ignore_migration("app_correct", "0001_initial"))
+        self.assertTrue(linter.should_ignore_migration("app_correct", "0002_foo"))
 
     def test_gather_all_migrations(self):
-        linter = MigrationLinter(fixtures.CORRECT_PROJECT)
+        linter = MigrationLinter()
         migrations = linter._gather_all_migrations()
-        self.assertEqual(len(migrations), 4)
-        self.assertEqual(
-            sorted([(m.app_name, m.name) for m in migrations]),
-            sorted([
-                ("test_app1", "0001_initial"),
-                ("test_app1", "0002_a_new_null_field"),
-                ("test_app2", "0001_foo"),
-                ("test_app3", "0001_initial"),
-            ])
-        )
+        self.assertGreater(len(list(migrations)), 1)

tests/unit/test_utils.py

@@ -12,74 +12,46 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import unittest
 
-from tests import fixtures
-from django_migration_linter.utils import is_django_project, is_directory, find_project_settings_module, \
-    split_path, split_migration_path
+from django_migration_linter.utils import split_path, split_migration_path
 
 
-class UtilityFunctionTest(unittest.TestCase):
-    def test_detect_django_project(self):
-        self.assertTrue(is_django_project(fixtures.ADD_NOT_NULL_COLUMN_PROJECT))
-
-    def test_detect_not_django_project(self):
-        self.assertFalse(is_django_project(fixtures._BASE_DIR))
-
-    def test_detect_directory(self):
-        self.assertTrue(is_directory(fixtures.ADD_NOT_NULL_COLUMN_PROJECT))
-
-    def test_detect_not_directory(self):
-        self.assertFalse(is_directory(
-            os.path.join(fixtures.ADD_NOT_NULL_COLUMN_PROJECT, 'manage.py')))
-
-    def test_find_project_settings_module_same_project_name(self):
-        expected = 'test_project_add_not_null_column.settings'
-        actual = find_project_settings_module(fixtures.ADD_NOT_NULL_COLUMN_PROJECT)
-        self.assertEqual(actual, expected)
-
-    def test_find_project_settings_module_different_project_name(self):
-        expected = 'test_project.settings'
-        actual = find_project_settings_module(fixtures.CORRECT_PROJECT)
-        self.assertEqual(actual, expected)
-
-
-class SplitPathTest(unittest.TestCase):
+class SplitPathTestCase(unittest.TestCase):
     def test_split_path(self):
-        split = split_path('foo/bar/fuz.py')
+        split = split_path("foo/bar/fuz.py")
         self.assertEqual(split, ["foo", "bar", "fuz.py"])
 
     def test_split_full_path(self):
-        split = split_path('/foo/bar/fuz.py')
+        split = split_path("/foo/bar/fuz.py")
         self.assertEqual(split, ["/", "foo", "bar", "fuz.py"])
 
     def test_split_folder_path(self):
-        split = split_path('/foo/bar')
+        split = split_path("/foo/bar")
         self.assertEqual(split, ["/", "foo", "bar"])
 
     def test_split_folder_path_trailing_slash(self):
-        split = split_path('/foo/bar/')
+        split = split_path("/foo/bar/")
         self.assertEqual(split, ["/", "foo", "bar"])
 
     def test_split_folder_path_trailing_slashes(self):
-        split = split_path('/foo/bar///')
+        split = split_path("/foo/bar///")
         self.assertEqual(split, ["/", "foo", "bar"])
 
     def test_split_migration_long_path(self):
-        input_path = 'apps/the_app/migrations/0001_stuff.py'
+        input_path = "apps/the_app/migrations/0001_stuff.py"
         app, mig = split_migration_path(input_path)
-        self.assertEqual(app, 'the_app')
-        self.assertEqual(mig, '0001_stuff')
+        self.assertEqual(app, "the_app")
+        self.assertEqual(mig, "0001_stuff")
 
     def test_split_migration_path(self):
-        input_path = 'the_app/migrations/0001_stuff.py'
+        input_path = "the_app/migrations/0001_stuff.py"
         app, mig = split_migration_path(input_path)
-        self.assertEqual(app, 'the_app')
-        self.assertEqual(mig, '0001_stuff')
+        self.assertEqual(app, "the_app")
+        self.assertEqual(mig, "0001_stuff")
 
     def test_split_migration_full_path(self):
-        input_path = '/home/user/djangostuff/apps/the_app/migrations/0001_stuff.py'
+        input_path = "/home/user/djangostuff/apps/the_app/migrations/0001_stuff.py"
         app, mig = split_migration_path(input_path)
-        self.assertEqual(app, 'the_app')
-        self.assertEqual(mig, '0001_stuff')
+        self.assertEqual(app, "the_app")
+        self.assertEqual(mig, "0001_stuff")