diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2014-04-14 09:42:24 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2014-04-14 09:42:24 -0500 |
| commit | 9ebdcdb2f7718ae9203b20dafea4bca9f310ed75 (patch) | |
| tree | d35841ffc9d7a25eb60c9046a1cc149d875bacbe | |
| parent | de3f42ddf354d664195f1d0d3ddc8a77aa19dfdc (diff) | |
| parent | 60b73c7d8da0d5bee9787f86b0b213178a433bd1 (diff) | |
| download | bcfg2-9ebdcdb2f7718ae9203b20dafea4bca9f310ed75.tar.gz bcfg2-9ebdcdb2f7718ae9203b20dafea4bca9f310ed75.tar.bz2 bcfg2-9ebdcdb2f7718ae9203b20dafea4bca9f310ed75.zip | |
Merge branch 'master-test-fixes' of https://github.com/fennm/bcfg2
| -rw-r--r-- | src/lib/Bcfg2/Options/Options.py | 1 | ||||
| -rw-r--r-- | testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Options/Options.py b/src/lib/Bcfg2/Options/Options.py index 136511f41..11388fb4d 100644 --- a/src/lib/Bcfg2/Options/Options.py +++ b/src/lib/Bcfg2/Options/Options.py @@ -284,7 +284,6 @@ class Option(object): (self, parser)) - class PathOption(Option): """ Shortcut for options that expect a path argument. Uses :meth:`Bcfg2.Options.Types.path` to transform the argument into a diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py index c9a982bb3..32766b5c1 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py @@ -278,6 +278,7 @@ group: group:with:colons def test_probes_db(self): """ Set and retrieve probe data with database enabled """ Bcfg2.Options.setup.probes_db = True + syncdb(TestProbesDB) self._perform_tests() def test_allowed_cgroups(self): |