os.symlink("/usr/bin/env", fname)
self.torm.append((fname, False))
env_snt = {"PHASE": phase}
- env_exp = "PHASE=%s\n" % phase
+ env_exp = "PHASE=%s" % phase
self.failUnlessEqual(self.hr.RunHooks(self.hpath, phase, env_snt),
[(self._rname(fname), HKR_SUCCESS, env_exp)])
@return: script execution failure from all nodes
"""
- return dict([(node, rpc.RpcResult([("utest", constants.HKR_FAIL, "err")],
- node=node, call='FakeScriptFail')) for node in node_list])
+ rr = rpc.RpcResult
+ return dict([(node, rr((True, [("utest", constants.HKR_FAIL, "err")]),
+ node=node, call='FakeScriptFail'))
+ for node in node_list])
@staticmethod
def _call_script_succeed(node_list, hpath, phase, env):
@return: script execution from all nodes
"""
- return dict([(node, rpc.RpcResult([("utest", constants.HKR_SUCCESS, "ok")],
- node=node, call='FakeScriptOk')) for node in node_list])
+ rr = rpc.RpcResult
+ return dict([(node, rr(True, [("utest", constants.HKR_SUCCESS, "ok")],
+ node=node, call='FakeScriptOk'))
+ for node in node_list])
def setUp(self):
self.op = opcodes.OpCode()
def testTotalFalse(self):
"""Test complete rpc failure"""
- hm = mcpu.HooksMaster(self._call_false, FakeProc(), self.lu)
+ hm = mcpu.HooksMaster(self._call_false, self.lu)
self.failUnlessRaises(errors.HooksFailure,
hm.RunPhase, constants.HOOKS_PHASE_PRE)
hm.RunPhase(constants.HOOKS_PHASE_POST)
def testIndividualFalse(self):
"""Test individual node failure"""
- hm = mcpu.HooksMaster(self._call_nodes_false, FakeProc(), self.lu)
+ hm = mcpu.HooksMaster(self._call_nodes_false, self.lu)
hm.RunPhase(constants.HOOKS_PHASE_PRE)
#self.failUnlessRaises(errors.HooksFailure,
# hm.RunPhase, constants.HOOKS_PHASE_PRE)
def testScriptFalse(self):
"""Test individual rpc failure"""
- hm = mcpu.HooksMaster(self._call_script_fail, FakeProc(), self.lu)
+ hm = mcpu.HooksMaster(self._call_script_fail, self.lu)
self.failUnlessRaises(errors.HooksAbort,
hm.RunPhase, constants.HOOKS_PHASE_PRE)
hm.RunPhase(constants.HOOKS_PHASE_POST)
def testScriptSucceed(self):
"""Test individual rpc failure"""
- hm = mcpu.HooksMaster(self._call_script_succeed, FakeProc(), self.lu)
+ hm = mcpu.HooksMaster(self._call_script_succeed, self.lu)
for phase in (constants.HOOKS_PHASE_PRE, constants.HOOKS_PHASE_POST):
hm.RunPhase(phase)