projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel-2.1'
[ganeti-local]
/
test
/
ganeti.hooks_unittest.py
diff --git
a/test/ganeti.hooks_unittest.py
b/test/ganeti.hooks_unittest.py
index
55fa721
..
594c321
100755
(executable)
--- a/
test/ganeti.hooks_unittest.py
+++ b/
test/ganeti.hooks_unittest.py
@@
-39,11
+39,15
@@
from ganeti.constants import HKR_SUCCESS, HKR_FAIL, HKR_SKIP
from mocks import FakeConfig, FakeProc, FakeContext
from mocks import FakeConfig, FakeProc, FakeContext
+import testutils
+
+
class FakeLU(cmdlib.LogicalUnit):
HPATH = "test"
def BuildHooksEnv(self):
return {}, ["localhost"], ["localhost"]
class FakeLU(cmdlib.LogicalUnit):
HPATH = "test"
def BuildHooksEnv(self):
return {}, ["localhost"], ["localhost"]
+
class TestHooksRunner(unittest.TestCase):
"""Testing case for HooksRunner"""
def setUp(self):
class TestHooksRunner(unittest.TestCase):
"""Testing case for HooksRunner"""
def setUp(self):
@@
-266,5
+270,6
@@
class TestHooksMaster(unittest.TestCase):
for phase in (constants.HOOKS_PHASE_PRE, constants.HOOKS_PHASE_POST):
hm.RunPhase(phase)
for phase in (constants.HOOKS_PHASE_PRE, constants.HOOKS_PHASE_POST):
hm.RunPhase(phase)
+
if __name__ == '__main__':
if __name__ == '__main__':
- unittest.main()
+ testutils.GanetiTestProgram()