[gsoc2009-testing] Massive merge update to trunk. This is in preparation for the release of a sample app and tests

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/test-improvements@11385 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 13 insertions, 21 deletions

diff --git a/tests/regressiontests/admin_widgets/tests.py b/tests/regressiontests/admin_widgets/tests.py
index 69bc54e33a..85651542bb 100644
--- a/tests/regressiontests/admin_widgets/tests.py
+++ b/tests/regressiontests/admin_widgets/tests.py
@@ -115,6 +115,7 @@ class AdminFormfieldForDBFieldWithRequestTests(DjangoTestCase):
 
 class AdminForeignKeyWidgetChangeList(DjangoTestCase):
     fixtures = ["admin-widgets-users.xml"]
+    admin_root = '/widget_admin'
 
     def setUp(self):
         self.client.login(username="super", password="secret")
@@ -123,25 +124,9 @@ class AdminForeignKeyWidgetChangeList(DjangoTestCase):
         self.client.logout()
 
     def test_changelist_foreignkey(self):
-        response = self.client.get('/widget_admin/admin_widgets/car/')
-        self.failUnless('/widget_admin/auth/user/add/' in response.content)
+        response = self.client.get('%s/admin_widgets/car/' % self.admin_root)
+        self.failUnless('%s/auth/user/add/' % self.admin_root in response.content)
 
-
-
-# import os
-# from django.test import windmill_tests as djangotest
-# #from windmill.authoring import djangotest
-# #from windmill.conf import global_settings
-# 
-# class TestProjectWindmillTest(djangotest.WindmillDjangoUnitTest):
-#     fixtures = ['admin-views-users.xml', 'admin-views-colors.xml', 'admin-views-fabrics.xml', 'admin-views-unicode.xml',
-#      'multiple-child-classes', 'admin-views-actions.xml', 'string-primary-key.xml', 'admin-views-person.xml']
-#     test_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'windmilltests')
-#     #test_dir = os.path.dirname(os.path.abspath(__file__))
-#     #test_dir = os.path.dirname(os.path.abspath(__file__))
-#     browser = 'firefox'
-#     test_url = 'http://localhost:8000/test_admin/admin/'
-#     #global_settings.TEST_URL = test_url
-# 
-#     # def test_tryout(self):
-#     #     pass
+class OldAdminForeignKeyWidgetChangeList(AdminForeignKeyWidgetChangeList):
+    urls = 'regressiontests.admin_widgets.urls2'
+    admin_root = '/deep/down/admin'
diff --git a/tests/regressiontests/admin_widgets/urls2.py b/tests/regressiontests/admin_widgets/urls2.py
new file mode 100644
index 0000000000..1ad060cd09
--- /dev/null
+++ b/tests/regressiontests/admin_widgets/urls2.py
@@ -0,0 +1,7 @@
+
+from django.conf.urls.defaults import *
+import widgetadmin
+
+urlpatterns = patterns('',
+    (r'^deep/down/admin/(.*)', widgetadmin.site.root),
+)