diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-10-29 10:21:12 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-10-29 15:22:33 -0400 |
| commit | 6dd9756f7a87d5e875f5db02f306c7b906902a96 (patch) | |
| tree | 81ab5e948e9b2449609e260628d5d14f63f5a6cf /testsuite/Testsrc/Testlib/TestServer/TestPlugin | |
| parent | aec12296330b121fcb3fd038f85c0a4590be8ce4 (diff) | |
| download | bcfg2-6dd9756f7a87d5e875f5db02f306c7b906902a96.tar.gz bcfg2-6dd9756f7a87d5e875f5db02f306c7b906902a96.tar.bz2 bcfg2-6dd9756f7a87d5e875f5db02f306c7b906902a96.zip | |
Plugins: refactored out unnecessary datastore constructor argument
Diffstat (limited to 'testsuite/Testsrc/Testlib/TestServer/TestPlugin')
3 files changed, 4 insertions, 5 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py index 9b55b3ae8..f135a0197 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py @@ -29,7 +29,7 @@ class TestPlugin(TestDebuggable): @patchIf(not isinstance(os.makedirs, Mock), "os.makedirs", Mock()) def inner(): - return self.test_obj(core, datastore) + return self.test_obj(core) return inner() @patch("os.makedirs") diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py index dbab60abc..81c4837e1 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py @@ -1180,7 +1180,7 @@ class TestPrioDir(TestPlugin, TestGenerator, TestXMLDirectoryBacked): Mock()) @patchIf(not isinstance(os.makedirs, Mock), "os.makedirs", Mock()) def inner(): - return self.test_obj(core, datastore) + return self.test_obj(core) return inner() @@ -1416,7 +1416,7 @@ class TestEntrySet(TestDebuggable): set_setup_default("default_paranoid", False) set_setup_default("default_sensitive", False) - def get_obj(self, basename="test", path=datastore, entry_type=MagicMock()): + def get_obj(self, basename="test", entry_type=MagicMock()): return self.test_obj(basename, path, entry_type) def test__init(self): @@ -1791,7 +1791,7 @@ class TestGroupSpool(TestPlugin, TestGenerator): @patch("%s.%s.AddDirectoryMonitor" % (self.test_obj.__module__, self.test_obj.__name__)) def inner(mock_Add): - gs = self.test_obj(MagicMock(), datastore) + gs = self.test_obj(MagicMock()) mock_Add.assert_called_with('') self.assertItemsEqual(gs.Entries, {gs.entry_type: {}}) diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testinterfaces.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testinterfaces.py index ac0454f84..bbfb495c4 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testinterfaces.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testinterfaces.py @@ -374,4 +374,3 @@ class TestClientACLs(Bcfg2TestCase): ca = self.get_obj() self.assertIn(ca.check_acl_metadata(Mock(), Mock()), [True, False]) - |