Use glamkit's urls for tests, not just icekit's.

icekit/project/settings/glamkit.py

@@ -11,7 +11,10 @@
     'icekit_events.page_types.eventlistingfordate',
 )
 
-ROOT_URLCONF = "icekit.project.glamkit_urls"
+# This settings file is loaded after calculated.py, so we don't want to
+# overwrite the urlconf if it is set to the test urls.
+if not 'test' in ROOT_URLCONF:
+    ROOT_URLCONF = "icekit.project.glamkit_urls"
 
 # ICEKIT PRESS RELEASES #######################################################
 

icekit/tests/urls.py

@@ -1,10 +1,9 @@
 from django.conf.urls import patterns, url, include
-
-from icekit.project.urls import urlpatterns as icekit_patterns
+from icekit.project.glamkit_urls import urlpatterns as glamkit_patterns
 
 urlpatterns = patterns(
     '',
     url(r'^404/$', 'icekit.response_pages.views.page_not_found', name='404'),
     url(r'^500/$', 'icekit.response_pages.views.server_error', name='500'),
-    url(r'^', include(icekit_patterns)),
+    url(r'^', include(glamkit_patterns)),
 )