From 6b63742ce5a63484890f147830d3fa9b2d0342f9 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 3 Mar 2014 19:29:50 +0800 Subject: [PATCH] Corrected expected test output to allow for cleanups in signal and compatibility checks. --- django/core/checks/model_checks.py | 4 ++-- tests/check_framework/tests.py | 2 +- tests/model_validation/tests.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/django/core/checks/model_checks.py b/django/core/checks/model_checks.py index 7029317324..46e5c6ff94 100644 --- a/django/core/checks/model_checks.py +++ b/django/core/checks/model_checks.py @@ -31,9 +31,9 @@ def check_model_signals(app_configs=None, **kwargs): # The receiver is either a function or an instance of class # defining a `__call__` method. if isinstance(receiver, types.FunctionType): - description = "The `%s` function" % receiver.__name__ + description = "The '%s' function" % receiver.__name__ else: - description = "An instance of the `%s` class" % receiver.__class__.__name__ + description = "An instance of the '%s' class" % receiver.__class__.__name__ errors.append( Error( "%s was connected to the '%s' signal " diff --git a/tests/check_framework/tests.py b/tests/check_framework/tests.py index c3ddc770e0..c770ee517b 100644 --- a/tests/check_framework/tests.py +++ b/tests/check_framework/tests.py @@ -134,7 +134,7 @@ class Django_1_6_0_CompatibilityChecks(TestCase): errors = check_1_6_compatibility() expected = [ checks.Warning( - 'BooleanField does not have a default value. ', + 'BooleanField does not have a default value.', hint=('Django 1.6 changed the default value of BooleanField from False to None. ' 'See https://docs.djangoproject.com/en/1.6/ref/models/fields/#booleanfield ' 'for more information.'), diff --git a/tests/model_validation/tests.py b/tests/model_validation/tests.py index 4c2c55dd21..a9fb30cbcd 100644 --- a/tests/model_validation/tests.py +++ b/tests/model_validation/tests.py @@ -32,7 +32,7 @@ class ModelValidationTest(TestCase): errors = run_checks() expected = [ Error( - "The `on_post_init` function was connected to the `post_init` " + "The 'on_post_init' function was connected to the 'post_init' " "signal with a lazy reference to the 'missing-app.Model' " "sender, which has not been installed.", hint=None, @@ -40,8 +40,8 @@ class ModelValidationTest(TestCase): id='signals.E001', ), Error( - "An instance of the `OnPostInit` class was connected to " - "the `post_init` signal with a lazy reference to the " + "An instance of the 'OnPostInit' class was connected to " + "the 'post_init' signal with a lazy reference to the " "'missing-app.Model' sender, which has not been installed.", hint=None, obj='model_validation.tests',