From 8d3147e130c4e5638fceb1e6125c040362ce12e8 Mon Sep 17 00:00:00 2001 From: Dakota Hawkins Date: Wed, 19 Dec 2018 06:41:31 -0500 Subject: Fixed #30031 -- Added --no-header option to makemigrations/squashmigrations. --- tests/migrations/test_writer.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/migrations/test_writer.py b/tests/migrations/test_writer.py index f7ec6f4bd3..467ff4475b 100644 --- a/tests/migrations/test_writer.py +++ b/tests/migrations/test_writer.py @@ -613,16 +613,21 @@ class WriterTests(SimpleTestCase): }) dt = datetime.datetime(2015, 7, 31, 4, 40, 0, 0, tzinfo=utc) with mock.patch('django.db.migrations.writer.now', lambda: dt): - writer = MigrationWriter(migration) - output = writer.as_string() - - self.assertTrue( - output.startswith( - "# Generated by Django %(version)s on 2015-07-31 04:40\n" % { - 'version': get_version(), - } - ) - ) + for include_header in (True, False): + with self.subTest(include_header=include_header): + writer = MigrationWriter(migration, include_header) + output = writer.as_string() + + self.assertEqual( + include_header, + output.startswith( + "# Generated by Django %s on 2015-07-31 04:40\n\n" % get_version() + ) + ) + if not include_header: + # Make sure the output starts with something that's not + # a comment or indentation or blank line + self.assertRegex(output.splitlines(keepends=True)[0], r"^[^#\s]+") def test_models_import_omitted(self): """ -- cgit v1.3