From febcbbf89d978b60ffe13ab839dcc98639c3f522 Mon Sep 17 00:00:00 2001 From: Marten Kenbeek Date: Sun, 15 Mar 2015 23:54:20 +0100 Subject: [1.8.x] Fixed #24488 -- Made create_default_site() use default pk of 1. Fixed create_default_site() to use a default value in case settings.SITE_ID isn't set; refs #23945. Backport of 818182b514d1c6b379130c440689355b4d231d49 from master --- tests/sites_tests/tests.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'tests') diff --git a/tests/sites_tests/tests.py b/tests/sites_tests/tests.py index 9b409fd0b5..128420a17b 100644 --- a/tests/sites_tests/tests.py +++ b/tests/sites_tests/tests.py @@ -209,6 +209,15 @@ class CreateDefaultSiteTests(TestCase): create_default_site(self.app_config, verbosity=0) self.assertEqual(Site.objects.get().pk, 35696) + @override_settings() # Restore original ``SITE_ID`` afterwards. + def test_no_site_id(self): + """ + #24488 - The pk should default to 1 if no ``SITE_ID`` is configured. + """ + del settings.SITE_ID + create_default_site(self.app_config, verbosity=0) + self.assertEqual(Site.objects.get().pk, 1) + class MiddlewareTest(TestCase): -- cgit v1.3