summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2015-10-01 19:58:20 -0500
committerSol Jerome <sol.jerome@gmail.com>2015-10-01 19:58:20 -0500
commit35a2ad1d76790b62b3dbb41cb7fa112c81dc4d5f (patch)
treea451a77147bc9fabce6e224e2038eedc78e27969 /testsuite
parent061bd6abbb598659554f28a1a5bba45fd6eca6da (diff)
parenta505fb3b2df0d1eddfe7a92afb080b016e951a43 (diff)
downloadbcfg2-35a2ad1d76790b62b3dbb41cb7fa112c81dc4d5f.tar.gz
bcfg2-35a2ad1d76790b62b3dbb41cb7fa112c81dc4d5f.tar.bz2
bcfg2-35a2ad1d76790b62b3dbb41cb7fa112c81dc4d5f.zip
Merge branch 'fix/django1.7' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/common.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/testsuite/common.py b/testsuite/common.py
index 45cfcbf0b..9f51cc14f 100644
--- a/testsuite/common.py
+++ b/testsuite/common.py
@@ -217,6 +217,10 @@ class DBModelTestCase(Bcfg2TestCase):
""" Create the test database and sync the schema """
if self.models:
import django.core.management
+ import django
+ if django.VERSION[0] == 1 and django.VERSION[1] >= 7:
+ django.setup()
+
django.core.management.call_command("syncdb", interactive=False,
verbosity=0)
self.assertTrue(