From 48dea2ea0ce93b80484abac6875da4fdf5a20ce7 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 8 Aug 2013 15:35:23 -0400 Subject: testsuite: fixed unit tests for server plugins --- testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py | 5 ++++- testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'testsuite/Testsrc/Testlib/TestClient/TestTools') diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py index 3d2e762ff..d9d8a26c6 100644 --- a/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py +++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py @@ -24,11 +24,14 @@ from TestTools.Test_init import TestTool class TestPOSIXUsers(TestTool): test_obj = POSIXUsers - def get_obj(self, config=None): + def setUp(self): + TestTool.setUp(self) set_setup_default('uid_whitelist') set_setup_default('uid_blacklist') set_setup_default('gid_whitelist') set_setup_default('gid_blacklist') + + def get_obj(self, config=None): return TestTool.get_obj(self, config) @patch("pwd.getpwall") diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py index cbf8e4911..1bf073f81 100644 --- a/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py +++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py @@ -21,11 +21,13 @@ from common import * class TestTool(Bcfg2TestCase): test_obj = Tool + def setUp(self): + set_setup_default('command_timeout') + set_setup_default('interactive', False) + def get_obj(self, config=None): if config is None: config = lxml.etree.Element("Configuration") - set_setup_default('command_timeout') - set_setup_default('interactive', False) execs = self.test_obj.__execs__ self.test_obj.__execs__ = [] -- cgit v1.2.3-1-g7c22