Revision 2395c322 test/ganeti.hooks_unittest.py

b/test/ganeti.hooks_unittest.py
36 36
from ganeti import cmdlib
37 37
from ganeti.constants import HKR_SUCCESS, HKR_FAIL, HKR_SKIP
38 38

  
39
from mocks import FakeConfig, FakeSStore
39
from mocks import FakeConfig, FakeSStore, FakeProc
40 40

  
41 41
class FakeLU(cmdlib.LogicalUnit):
42 42
  HPATH = "test"
......
231 231
    sstore = FakeSStore()
232 232
    op = opcodes.OpCode()
233 233
    lu = FakeLU(None, op, cfg, sstore)
234
    hm = mcpu.HooksMaster(self._call_false, lu)
234
    hm = mcpu.HooksMaster(self._call_false, FakeProc(), lu)
235 235
    self.failUnlessRaises(errors.HooksFailure,
236 236
                          hm.RunPhase, constants.HOOKS_PHASE_PRE)
237 237
    hm.RunPhase(constants.HOOKS_PHASE_POST)
238 238

  
239 239
  def testIndividualFalse(self):
240
    """Test individual rpc failure"""
240
    """Test individual node failure"""
241 241
    cfg = FakeConfig()
242 242
    sstore = FakeSStore()
243 243
    op = opcodes.OpCode()
244 244
    lu = FakeLU(None, op, cfg, sstore)
245
    hm = mcpu.HooksMaster(self._call_nodes_false, lu)
246
    self.failUnlessRaises(errors.HooksFailure,
247
                          hm.RunPhase, constants.HOOKS_PHASE_PRE)
245
    hm = mcpu.HooksMaster(self._call_nodes_false, FakeProc(), lu)
246
    hm.RunPhase(constants.HOOKS_PHASE_PRE)
247
    #self.failUnlessRaises(errors.HooksFailure,
248
    #                      hm.RunPhase, constants.HOOKS_PHASE_PRE)
248 249
    hm.RunPhase(constants.HOOKS_PHASE_POST)
249 250

  
250 251
  def testScriptFalse(self):
......
253 254
    op = opcodes.OpCode()
254 255
    sstore = FakeSStore()
255 256
    lu = FakeLU(None, op, cfg, sstore)
256
    hm = mcpu.HooksMaster(self._call_script_fail, lu)
257
    hm = mcpu.HooksMaster(self._call_script_fail, FakeProc(), lu)
257 258
    self.failUnlessRaises(errors.HooksAbort,
258 259
                          hm.RunPhase, constants.HOOKS_PHASE_PRE)
259 260
    hm.RunPhase(constants.HOOKS_PHASE_POST)
......
264 265
    op = opcodes.OpCode()
265 266
    sstore = FakeSStore()
266 267
    lu = FakeLU(None, op, cfg, sstore)
267
    hm = mcpu.HooksMaster(self._call_script_succeed, lu)
268
    hm = mcpu.HooksMaster(self._call_script_succeed, FakeProc(), lu)
268 269
    for phase in (constants.HOOKS_PHASE_PRE, constants.HOOKS_PHASE_POST):
269 270
      hm.RunPhase(phase)
270 271

  

Also available in: Unified diff