Initial sorta-mostly-working with Django 1.8. Incredibly noisy due to

incomprehensible advance depreciation warnings for Django 1.9.

svn path=/branches/tk705/; revision=6100

2 files changed, 22 insertions, 12 deletions

diff --git a/ca/tests/yamlconf.py b/ca/tests/yamlconf.py
index 4c003835..13456377 100644
--- a/ca/tests/yamlconf.py
+++ b/ca/tests/yamlconf.py
@@ -778,12 +778,15 @@ def body():
 
   databases["default"] = databases[db.root.irdb_name]
 
+  import django
+  django.setup()
+
   from django.conf import settings
 
   settings.configure(
-    DATABASES = databases,
+    DATABASES        = databases,
     DATABASE_ROUTERS = ["rpki.irdb.router.DBContextRouter"],
-    INSTALLED_APPS = ("rpki.irdb", "south"))
+    INSTALLED_APPS   = ["rpki.irdb"])
 
   import rpki.irdb
 
diff --git a/ca/tests/yamltest.py b/ca/tests/yamltest.py
index 308884a9..8c5e41b9 100644
--- a/ca/tests/yamltest.py
+++ b/ca/tests/yamltest.py
@@ -580,7 +580,7 @@ class allocation(object):
     # easier than figuring out how to change Django settings after
     # initialization.
 
-    def sync_app(app, verbosity = 1):
+    def sync_settings(settings, verbosity = 1):
 
       if verbosity > 0:
         print "Running Django setup for", self.name
@@ -588,23 +588,30 @@ class allocation(object):
       pid = os.fork()
 
       if pid == 0:
-        os.environ.update(RPKI_CONF = self.path("rpki.conf"),
-                          DJANGO_SETTINGS_MODULE = "rpki.django_settings." + app)
         logging.getLogger().setLevel(logging.WARNING)
+
+        os.environ.update(RPKI_CONF = self.path("rpki.conf"),
+                          DJANGO_SETTINGS_MODULE = "rpki.django_settings." + settings)
+
+        import django
+        django.setup()
+
         import django.core.management
-        django.core.management.call_command("syncdb", migrate = True, verbosity = verbosity,
+        #django.core.management.call_command("syncdb", migrate = True, verbosity = verbosity, load_initial_data = False, interactive = False)
+        django.core.management.call_command("migrate", verbosity = verbosity,
                                             load_initial_data = False, interactive = False)
-        if app in ("gui", "irdb"):
+
+        if settings in ("gui", "irdb"):
           from django.contrib.auth.models import User
           User.objects.create_superuser("root", "root@example.org", "fnord")
+
         sys.exit(0)
 
-      else:
-        if os.waitpid(pid, 0)[1]:
-          raise RuntimeError("Django setup failed for %s %s" % (self.name, app))
+      elif os.waitpid(pid, 0)[1]:
+        raise RuntimeError("Django setup failed for %s %s" % (self.name, settings))
 
-    for app in ("rpkid", "pubd", "gui"):
-      sync_app(app)
+    for settings in ("rpkid", "pubd", "gui"):
+      sync_settings(settings)
 
   def run_python_daemon(self, prog):
     """