diff options
| author | Dan Davis <danizen@users.noreply.github.com> | 2019-02-13 13:59:44 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2019-02-13 14:00:53 -0500 |
| commit | 5e94c817ee26a13e141a11a2f429f9ee2cc37ab0 (patch) | |
| tree | 1e72185ce851768a48cc49812f95af6f4770c9d8 /tests | |
| parent | f2b460231dc15d4d0629b856f31ff9433da07f95 (diff) | |
[2.2.x] Fixed #30184 -- Removed ellipsis characters from shell output strings.
Partially reverted 50b8493581fea3d7137dd8db33bac7008868d23a (refs #29654)
to avoid a crash when the user shell doesn't support non-ASCII characters.
Backport of 2bd8df243ac6fc35e58c9fe90b20c9e42519a5ac from master.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/migrations/test_commands.py | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py index 972983536e..36e8f2f5ea 100644 --- a/tests/migrations/test_commands.py +++ b/tests/migrations/test_commands.py @@ -41,7 +41,7 @@ class MigrateTests(MigrationTestBase): call_command('migrate', 'migrations', '0001', verbosity=1, stdout=stdout, no_color=True) stdout = stdout.getvalue() self.assertIn('Target specific migration: 0001_initial, from migrations', stdout) - self.assertIn('Applying migrations.0001_initial… OK', stdout) + self.assertIn('Applying migrations.0001_initial... OK', stdout) # The correct tables exist self.assertTableExists("migrations_author") self.assertTableExists("migrations_tribble") @@ -57,7 +57,7 @@ class MigrateTests(MigrationTestBase): call_command('migrate', 'migrations', 'zero', verbosity=1, stdout=stdout, no_color=True) stdout = stdout.getvalue() self.assertIn('Unapply all migrations: migrations', stdout) - self.assertIn('Unapplying migrations.0002_second… OK', stdout) + self.assertIn('Unapplying migrations.0002_second... OK', stdout) # Tables are gone self.assertTableNotExists("migrations_author") self.assertTableNotExists("migrations_tribble") @@ -157,7 +157,7 @@ class MigrateTests(MigrationTestBase): call_command("migrate", "migrations", "0001", fake_initial=True, stdout=out, verbosity=1) call_command("migrate", "migrations", "0001", fake_initial=True, verbosity=0, database="other") self.assertIn( - "migrations.0001_initial… faked", + "migrations.0001_initial... faked", out.getvalue().lower() ) # Run migrations all the way @@ -208,8 +208,8 @@ class MigrateTests(MigrationTestBase): with mock.patch('django.core.management.color.supports_color', lambda *args: False): call_command("migrate", "migrations", "0002", fake_initial=True, stdout=out, verbosity=1) value = out.getvalue().lower() - self.assertIn("migrations.0001_initial… faked", value) - self.assertIn("migrations.0002_second… faked", value) + self.assertIn("migrations.0001_initial... faked", value) + self.assertIn("migrations.0002_second... faked", value) # Fake an apply call_command("migrate", "migrations", fake=True, verbosity=0) # Unmigrate everything @@ -271,8 +271,8 @@ class MigrateTests(MigrationTestBase): call_command("showmigrations", format='plan', stdout=out, verbosity=2) self.assertEqual( "[ ] migrations.0001_initial\n" - "[ ] migrations.0003_third … (migrations.0001_initial)\n" - "[ ] migrations.0002_second … (migrations.0001_initial, migrations.0003_third)\n", + "[ ] migrations.0003_third ... (migrations.0001_initial)\n" + "[ ] migrations.0002_second ... (migrations.0001_initial, migrations.0003_third)\n", out.getvalue().lower() ) call_command("migrate", "migrations", "0003", verbosity=0) @@ -290,8 +290,8 @@ class MigrateTests(MigrationTestBase): call_command("showmigrations", format='plan', stdout=out, verbosity=2) self.assertEqual( "[x] migrations.0001_initial\n" - "[x] migrations.0003_third … (migrations.0001_initial)\n" - "[ ] migrations.0002_second … (migrations.0001_initial, migrations.0003_third)\n", + "[x] migrations.0003_third ... (migrations.0001_initial)\n" + "[ ] migrations.0002_second ... (migrations.0001_initial, migrations.0003_third)\n", out.getvalue().lower() ) @@ -410,10 +410,10 @@ class MigrateTests(MigrationTestBase): call_command("showmigrations", format='plan', stdout=out, verbosity=2) self.assertEqual( "[ ] migrations.1_auto\n" - "[ ] migrations.2_auto … (migrations.1_auto)\n" - "[ ] migrations.3_squashed_5 … (migrations.2_auto)\n" - "[ ] migrations.6_auto … (migrations.3_squashed_5)\n" - "[ ] migrations.7_auto … (migrations.6_auto)\n", + "[ ] migrations.2_auto ... (migrations.1_auto)\n" + "[ ] migrations.3_squashed_5 ... (migrations.2_auto)\n" + "[ ] migrations.6_auto ... (migrations.3_squashed_5)\n" + "[ ] migrations.7_auto ... (migrations.6_auto)\n", out.getvalue().lower() ) @@ -434,10 +434,10 @@ class MigrateTests(MigrationTestBase): call_command("showmigrations", format='plan', stdout=out, verbosity=2) self.assertEqual( "[x] migrations.1_auto\n" - "[x] migrations.2_auto … (migrations.1_auto)\n" - "[x] migrations.3_squashed_5 … (migrations.2_auto)\n" - "[ ] migrations.6_auto … (migrations.3_squashed_5)\n" - "[ ] migrations.7_auto … (migrations.6_auto)\n", + "[x] migrations.2_auto ... (migrations.1_auto)\n" + "[x] migrations.3_squashed_5 ... (migrations.2_auto)\n" + "[ ] migrations.6_auto ... (migrations.3_squashed_5)\n" + "[ ] migrations.7_auto ... (migrations.6_auto)\n", out.getvalue().lower() ) @@ -659,7 +659,7 @@ class MigrateTests(MigrationTestBase): self.assertGreater(len(execute.mock_calls), 2) stdout = stdout.getvalue() self.assertIn('Synchronize unmigrated apps: unmigrated_app_syncdb', stdout) - self.assertIn('Creating tables…', stdout) + self.assertIn('Creating tables...', stdout) table_name = truncate_name('unmigrated_app_syncdb_classroom', connection.ops.max_name_length()) self.assertIn('Creating table %s' % table_name, stdout) |
