diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2014-11-10 19:55:53 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-11-10 19:55:53 +0100 |
| commit | 3f32d999c6e75af57058e389a07d1ab6a62eaebb (patch) | |
| tree | 6055de1e6a541e2e5e4a721058f414a0e50258b6 /testsuite/Testsrc/Testlib/TestServer | |
| parent | da93fb540c28be3341ec0d37d1fbd90153fb750c (diff) | |
| parent | 0e133c157755908d05c44c3a36b1dc0668e1d111 (diff) | |
| download | bcfg2-3f32d999c6e75af57058e389a07d1ab6a62eaebb.tar.gz bcfg2-3f32d999c6e75af57058e389a07d1ab6a62eaebb.tar.bz2 bcfg2-3f32d999c6e75af57058e389a07d1ab6a62eaebb.zip | |
Merge branch 'options-unit-tests' of https://github.com/stpierre/bcfg2
* 'options-unit-tests' of https://github.com/stpierre/bcfg2:
Options: Fixed non-path database name parsing
Options: further command registry fixes
Options: gather as much data from config file first
Options: fix path canonicalization and file-like objects
testsuite: unlink temporary files
Options: ensure <repository> macros are always fixed up
DBSettings: fix up <repository> in database name
testsuite: better debug capturing for options tests
call shutdown on subcommand registries
fixed some places where plugin loading should fail silently
testsuite: Added unit tests for new option parsing
testsuite: capture stderr by default
Test failure to parse config file when bcfg2.conf exists
testsuite: skip nested exclusive option group test on py2.6
testsuite: Added unit tests for new option parsing
Diffstat (limited to 'testsuite/Testsrc/Testlib/TestServer')
| -rw-r--r-- | testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py | 1 | ||||
| -rw-r--r-- | testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py index f135a0197..290a7c092 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py @@ -22,6 +22,7 @@ class TestPlugin(TestDebuggable): def setUp(self): TestDebuggable.setUp(self) set_setup_default("filemonitor", MagicMock()) + set_setup_default("repository", datastore) def get_obj(self, core=None): if core is None: diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py index 37beaa26c..5a82100d0 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py @@ -55,6 +55,7 @@ class TestDatabaseBacked(TestPlugin): def setUp(self): TestPlugin.setUp(self) set_setup_default("%s_db" % self.test_obj.__name__.lower(), False) + set_setup_default("db_engine", None) @skipUnless(HAS_DJANGO, "Django not found") def test__use_db(self): |