Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Refs #21197 -- Clarified upgrade check message.

Thanks to Carl and Shai for the discussion.
  • Loading branch information...
commit 8ff43039466f5e3c78d3587fdbe229ed44c4e1aa 1 parent 935001c
Russell Keith-Magee authored October 08, 2013
6  django/core/checks/compatibility/django_1_6_0.py
@@ -16,10 +16,8 @@ def check_test_runner():
16 16
 
17 17
     if test_runner_setting == new_default:
18 18
         message = [
19  
-            "You have not explicitly set 'TEST_RUNNER'. In Django 1.6,",
20  
-            "there is a new test runner ('%s')" % new_default,
21  
-            "by default. You should ensure your tests are still all",
22  
-            "running & behaving as expected. See",
  19
+            "Django 1.6 introduced a new default test runner ('%s')" % new_default,
  20
+            "You should ensure your tests are all running & behaving as expected. See",
23 21
             "https://docs.djangoproject.com/en/dev/releases/1.6/#discovery-of-tests-in-any-test-module",
24 22
             "for more information.",
25 23
         ]
8  tests/check/tests.py
@@ -39,7 +39,7 @@ def tearDown(self):
39 39
     def test_check_test_runner_new_default(self):
40 40
         with self.settings(TEST_RUNNER='django.test.runner.DiscoverRunner'):
41 41
             result = django_1_6_0.check_test_runner()
42  
-            self.assertTrue("You have not explicitly set 'TEST_RUNNER'" in result)
  42
+            self.assertTrue("Django 1.6 introduced a new default test runner" in result)
43 43
 
44 44
     def test_check_test_runner_overridden(self):
45 45
         with self.settings(TEST_RUNNER='myapp.test.CustomRunnner'):
@@ -49,7 +49,7 @@ def test_run_checks_new_default(self):
49 49
         with self.settings(TEST_RUNNER='django.test.runner.DiscoverRunner'):
50 50
             result = django_1_6_0.run_checks()
51 51
             self.assertEqual(len(result), 1)
52  
-            self.assertTrue("You have not explicitly set 'TEST_RUNNER'" in result[0])
  52
+            self.assertTrue("Django 1.6 introduced a new default test runner" in result[0])
53 53
 
54 54
     def test_run_checks_overridden(self):
55 55
         with self.settings(TEST_RUNNER='myapp.test.CustomRunnner'):
@@ -77,7 +77,7 @@ def test_check_compatibility(self):
77 77
         with self.settings(TEST_RUNNER='django.test.runner.DiscoverRunner'):
78 78
             result = base.check_compatibility()
79 79
             self.assertEqual(len(result), 1)
80  
-            self.assertTrue("You have not explicitly set 'TEST_RUNNER'" in result[0])
  80
+            self.assertTrue("Django 1.6 introduced a new default test runner" in result[0])
81 81
 
82 82
         with self.settings(TEST_RUNNER='myapp.test.CustomRunnner'):
83 83
             self.assertEqual(len(base.check_compatibility()), 0)
@@ -121,7 +121,7 @@ def test_management_command(self):
121 121
             call_command('check')
122 122
 
123 123
         self.assertEqual(len(check.warnings._warnings), 1)
124  
-        self.assertTrue("You have not explicitly set 'TEST_RUNNER'" in check.warnings._warnings[0])
  124
+        self.assertTrue("Django 1.6 introduced a new default test runner" in check.warnings._warnings[0])
125 125
 
126 126
         # Restore the ``warnings``.
127 127
         base.warnings = old_warnings

0 notes on commit 8ff4303

Please sign in to comment.
Something went wrong with that request. Please try again.