summaryrefslogtreecommitdiffstats
path: root/testsuite/Testsrc/Testlib/TestClient
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2014-09-16 15:50:04 -0700
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2014-11-10 17:35:43 -0600
commit477c9c4119df5fd45c1129651922d238dccad8c9 (patch)
tree8ccbb610e1748a4cb07b93686d6926e4521db815 /testsuite/Testsrc/Testlib/TestClient
parent389ce1a86b704222ddc9458cd49c281e7601b803 (diff)
downloadbcfg2-477c9c4119df5fd45c1129651922d238dccad8c9.tar.gz
bcfg2-477c9c4119df5fd45c1129651922d238dccad8c9.tar.bz2
bcfg2-477c9c4119df5fd45c1129651922d238dccad8c9.zip
testsuite: Added unit tests for new option parsing
Diffstat (limited to 'testsuite/Testsrc/Testlib/TestClient')
-rw-r--r--testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py19
1 files changed, 9 insertions, 10 deletions
diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
index 0e9e3a141..b9de703ff 100644
--- a/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
+++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
@@ -17,18 +17,17 @@ while path != "/":
path = os.path.dirname(path)
from common import *
-# try to find true
-if os.path.exists("/bin/true"):
- TRUE = "/bin/true"
-elif os.path.exists("/usr/bin/true"):
- TRUE = "/usr/bin/true"
-else:
- TRUE = None
-
class TestTool(Bcfg2TestCase):
test_obj = Tool
+ if os.path.exists("/bin/true"):
+ true = "/bin/true"
+ elif os.path.exists("/usr/bin/true"):
+ true = "/usr/bin/true"
+ else:
+ true = None
+
def setUp(self):
set_setup_default('command_timeout')
set_setup_default('interactive', False)
@@ -77,11 +76,11 @@ class TestTool(Bcfg2TestCase):
["/test"] + [e.get("name") for e in important])
t.getSupportedEntries.assert_called_with()
- @skipIf(TRUE is None, "/bin/true or equivalent not found")
+ @skipIf(true is None, "/bin/true or equivalent not found")
def test__check_execs(self):
t = self.get_obj()
if t.__execs__ == []:
- t.__execs__.append(TRUE)
+ t.__execs__.append(self.true)
@patch("os.stat")
def inner(mock_stat):