diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-10-30 10:02:38 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-10-30 12:54:24 -0400 |
| commit | a8de10cde0b83743e8e453c8318cd1ab15e7c419 (patch) | |
| tree | ef1749c586f5c6521de28ffe7a8674f045f2fc7a /testsuite | |
| parent | 1c5c4f285293142e38ff54797e1c4b5a820e9cb0 (diff) | |
| download | bcfg2-a8de10cde0b83743e8e453c8318cd1ab15e7c419.tar.gz bcfg2-a8de10cde0b83743e8e453c8318cd1ab15e7c419.tar.bz2 bcfg2-a8de10cde0b83743e8e453c8318cd1ab15e7c419.zip | |
DB: fixed how Django settings are loaded
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/common.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/testsuite/common.py b/testsuite/common.py index 49035a177..c0dd8b518 100644 --- a/testsuite/common.py +++ b/testsuite/common.py @@ -39,11 +39,9 @@ def set_setup_default(option, value=None): setattr(Bcfg2.Options.setup, option, value) try: - from django.core.management import setup_environ + import django.conf has_django = True - os.environ['DJANGO_SETTINGS_MODULE'] = "Bcfg2.settings" - set_setup_default("db_engine", "sqlite3") set_setup_default("db_name", os.path.join(os.path.dirname(os.path.abspath(__file__)), @@ -58,8 +56,8 @@ try: set_setup_default("web_debug", False) set_setup_default("web_prefix") - import Bcfg2.settings - Bcfg2.settings.read_config() + import Bcfg2.DBSettings + Bcfg2.DBSettings.finalize_django_config() except ImportError: has_django = False @@ -163,12 +161,12 @@ class DBModelTestCase(Bcfg2TestCase): def test_syncdb(self): """ Create the test database and sync the schema """ if self.models: - setup_environ(Bcfg2.settings) import django.core.management django.core.management.call_command("syncdb", interactive=False, verbosity=0) self.assertTrue( - os.path.exists(Bcfg2.settings.DATABASES['default']['NAME'])) + os.path.exists( + django.conf.settings.DATABASES['default']['NAME'])) @skipUnless(has_django, "Django not found, skipping") def test_cleandb(self): |