From 0c9e006d5fddfe470553d792e2ecee02f467f2a8 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 12 Feb 2015 07:56:49 -0500 Subject: [PATCH] [1.7.x] Fixed #24293 -- Skipped a contrib.sites test if multiple databases aren't setup. --- django/contrib/sites/tests.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/django/contrib/sites/tests.py b/django/contrib/sites/tests.py index e59eb64e02..0e704763eb 100644 --- a/django/contrib/sites/tests.py +++ b/django/contrib/sites/tests.py @@ -1,9 +1,11 @@ from __future__ import unicode_literals +import unittest + from django.apps import apps from django.conf import settings from django.core.exceptions import ObjectDoesNotExist, ValidationError -from django.db import router +from django.db import connections, router from django.http import HttpRequest from django.test import TestCase, modify_settings, override_settings @@ -104,6 +106,7 @@ class CreateDefaultSiteTests(TestCase): create_default_site(self.app_config, verbosity=0) self.assertEqual(Site.objects.count(), 1) + @unittest.skipIf('other' not in connections, "Requires 'other' database connection.") def test_multi_db(self): """ #16353, #16828 - The default site creation should respect db routing.