Revision 880478f8 testing/ganeti.hooks_unittest.py

b/testing/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 fake_config import FakeConfig
39
from mocks import FakeConfig, FakeSStore
40 40

  
41 41
class FakeLU(cmdlib.LogicalUnit):
42 42
  HPATH = "test"
......
228 228
  def testTotalFalse(self):
229 229
    """Test complete rpc failure"""
230 230
    cfg = FakeConfig()
231
    sstore = FakeSStore()
231 232
    op = opcodes.OpCode()
232
    lu = FakeLU(None, op, cfg, None)
233
    hm = mcpu.HooksMaster(self._call_false, cfg, lu)
233
    lu = FakeLU(None, op, cfg, sstore)
234
    hm = mcpu.HooksMaster(self._call_false, cfg, sstore, lu)
234 235
    self.failUnlessRaises(errors.HooksFailure,
235 236
                          hm.RunPhase, constants.HOOKS_PHASE_PRE)
236 237
    hm.RunPhase(constants.HOOKS_PHASE_POST)
......
238 239
  def testIndividualFalse(self):
239 240
    """Test individual rpc failure"""
240 241
    cfg = FakeConfig()
242
    sstore = FakeSStore()
241 243
    op = opcodes.OpCode()
242
    lu = FakeLU(None, op, cfg, None)
243
    hm = mcpu.HooksMaster(self._call_nodes_false, cfg, lu)
244
    lu = FakeLU(None, op, cfg, sstore)
245
    hm = mcpu.HooksMaster(self._call_nodes_false, cfg, sstore, lu)
244 246
    self.failUnlessRaises(errors.HooksFailure,
245 247
                          hm.RunPhase, constants.HOOKS_PHASE_PRE)
246 248
    hm.RunPhase(constants.HOOKS_PHASE_POST)
......
249 251
    """Test individual rpc failure"""
250 252
    cfg = FakeConfig()
251 253
    op = opcodes.OpCode()
252
    lu = FakeLU(None, op, cfg, None)
253
    hm = mcpu.HooksMaster(self._call_script_fail, cfg, lu)
254
    sstore = FakeSStore()
255
    lu = FakeLU(None, op, cfg, sstore)
256
    hm = mcpu.HooksMaster(self._call_script_fail, cfg, sstore, lu)
254 257
    self.failUnlessRaises(errors.HooksAbort,
255 258
                          hm.RunPhase, constants.HOOKS_PHASE_PRE)
256 259
    hm.RunPhase(constants.HOOKS_PHASE_POST)
......
259 262
    """Test individual rpc failure"""
260 263
    cfg = FakeConfig()
261 264
    op = opcodes.OpCode()
262
    lu = FakeLU(None, op, cfg, None)
263
    hm = mcpu.HooksMaster(self._call_script_succeed, cfg, lu)
265
    sstore = FakeSStore()
266
    lu = FakeLU(None, op, cfg, sstore)
267
    hm = mcpu.HooksMaster(self._call_script_succeed, cfg, sstore, lu)
264 268
    for phase in (constants.HOOKS_PHASE_PRE, constants.HOOKS_PHASE_POST):
265 269
      hm.RunPhase(phase)
266 270

  

Also available in: Unified diff