projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix yet another bug in LURepairDiskSizes
[ganeti-local]
/
test
/
ganeti.hooks_unittest.py
diff --git
a/test/ganeti.hooks_unittest.py
b/test/ganeti.hooks_unittest.py
index
02522b9
..
55fef19
100755
(executable)
--- a/
test/ganeti.hooks_unittest.py
+++ b/
test/ganeti.hooks_unittest.py
@@
-34,6
+34,7
@@
from ganeti import mcpu
from ganeti import backend
from ganeti import constants
from ganeti import cmdlib
from ganeti import backend
from ganeti import constants
from ganeti import cmdlib
+from ganeti import rpc
from ganeti.constants import HKR_SUCCESS, HKR_FAIL, HKR_SKIP
from mocks import FakeConfig, FakeProc, FakeContext
from ganeti.constants import HKR_SUCCESS, HKR_FAIL, HKR_SKIP
from mocks import FakeConfig, FakeProc, FakeContext
@@
-181,7
+182,7
@@
class TestHooksRunner(unittest.TestCase):
os.symlink("/usr/bin/env", fname)
self.torm.append((fname, False))
env_snt = {"PHASE": phase}
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)])
self.failUnlessEqual(self.hr.RunHooks(self.hpath, phase, env_snt),
[(self._rname(fname), HKR_SUCCESS, env_exp)])
@@
-197,40
+198,41
@@
class TestHooksMaster(unittest.TestCase):
def _call_nodes_false(node_list, hpath, phase, env):
"""Fake call_hooks_runner function.
def _call_nodes_false(node_list, hpath, phase, env):
"""Fake call_hooks_runner function.
- Returns:
- - list of False values with the same len as the node_list argument
+ @rtype: dict of node -> L{rpc.RpcResult} with an rpc error
+ @return: rpc failure from all nodes
"""
"""
- return [False for node_name in node_list]
+ return dict([(node, rpc.RpcResult('error', failed=True,
+ node=node, call='FakeError')) for node in node_list])
@staticmethod
def _call_script_fail(node_list, hpath, phase, env):
"""Fake call_hooks_runner function.
@staticmethod
def _call_script_fail(node_list, hpath, phase, env):
"""Fake call_hooks_runner function.
- Returns:
- - list of False values with the same len as the node_list argument
+ @rtype: dict of node -> L{rpc.RpcResult} with a failed script result
+ @return: script execution failure from all nodes
"""
"""
- return dict([(node_name, [("unittest", constants.HKR_FAIL, "error")])
- for node_name in node_list])
+ return dict([(node, rpc.RpcResult([("utest", constants.HKR_FAIL, "err")],
+ node=node, call='FakeScriptFail')) for node in node_list])
@staticmethod
def _call_script_succeed(node_list, hpath, phase, env):
"""Fake call_hooks_runner function.
@staticmethod
def _call_script_succeed(node_list, hpath, phase, env):
"""Fake call_hooks_runner function.
- Returns:
- - list of False values with the same len as the node_list argument
+ @rtype: dict of node -> L{rpc.RpcResult} with a successful script result
+ @return: script execution from all nodes
"""
"""
- return dict([(node_name, [("unittest", constants.HKR_SUCCESS, "ok")])
- for node_name in node_list])
+ return dict([(node, rpc.RpcResult([("utest", constants.HKR_SUCCESS, "ok")],
+ node=node, call='FakeScriptOk')) for node in node_list])
def setUp(self):
self.op = opcodes.OpCode()
self.context = FakeContext()
# WARNING: here we pass None as RpcRunner instance since we know
# our usage via HooksMaster will not use lu.rpc
def setUp(self):
self.op = opcodes.OpCode()
self.context = FakeContext()
# WARNING: here we pass None as RpcRunner instance since we know
# our usage via HooksMaster will not use lu.rpc
- self.lu = FakeLU(None, self.op, self.context, None)
+ self.lu = FakeLU(FakeProc(), self.op, self.context, None)
def testTotalFalse(self):
"""Test complete rpc failure"""
def testTotalFalse(self):
"""Test complete rpc failure"""