locking: Change locking order, move NAL after instances

[ganeti-local] / test / ganeti.hooks_unittest.py

diff --git a/test/ganeti.hooks_unittest.py b/test/ganeti.hooks_unittest.py
index 6a6a6b3..e20fc11 100755 (executable)
--- a/test/ganeti.hooks_unittest.py
+++ b/test/ganeti.hooks_unittest.py
@@ -36,6 +36,7 @@ from ganeti import constants
 from ganeti import cmdlib
 from ganeti import rpc
 from ganeti import compat
+from ganeti import pathutils
 from ganeti.constants import HKR_SUCCESS, HKR_FAIL, HKR_SKIP
 
 from mocks import FakeConfig, FakeProc, FakeContext
@@ -205,7 +206,7 @@ def FakeHooksRpcSuccess(node_list, hpath, phase, env):
   """
   rr = rpc.RpcResult
   return dict([(node, rr((True, [("utest", constants.HKR_SUCCESS, "ok")]),
-                         node=node, call='FakeScriptOk'))
+                         node=node, call="FakeScriptOk"))
                for node in node_list])
 
 
@@ -224,8 +225,8 @@ class TestHooksMaster(unittest.TestCase):
     @return: rpc failure from all nodes
 
     """
-    return dict([(node, rpc.RpcResult('error', failed=True,
-                  node=node, call='FakeError')) for node 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):
@@ -237,7 +238,7 @@ class TestHooksMaster(unittest.TestCase):
     """
     rr = rpc.RpcResult
     return dict([(node, rr((True, [("utest", constants.HKR_FAIL, "err")]),
-                           node=node, call='FakeScriptFail'))
+                           node=node, call="FakeScriptFail"))
                   for node in node_list])
 
   def setUp(self):
@@ -249,14 +250,14 @@ class TestHooksMaster(unittest.TestCase):
 
   def testTotalFalse(self):
     """Test complete rpc failure"""
-    hm = mcpu.HooksMaster(self._call_false, self.lu)
+    hm = mcpu.HooksMaster.BuildFromLu(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, self.lu)
+    hm = mcpu.HooksMaster.BuildFromLu(self._call_nodes_false, self.lu)
     hm.RunPhase(constants.HOOKS_PHASE_PRE)
     #self.failUnlessRaises(errors.HooksFailure,
     #                      hm.RunPhase, constants.HOOKS_PHASE_PRE)
@@ -264,14 +265,14 @@ class TestHooksMaster(unittest.TestCase):
 
   def testScriptFalse(self):
     """Test individual rpc failure"""
-    hm = mcpu.HooksMaster(self._call_script_fail, self.lu)
+    hm = mcpu.HooksMaster.BuildFromLu(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(FakeHooksRpcSuccess, self.lu)
+    hm = mcpu.HooksMaster.BuildFromLu(FakeHooksRpcSuccess, self.lu)
     for phase in (constants.HOOKS_PHASE_PRE, constants.HOOKS_PHASE_POST):
       hm.RunPhase(phase)
 
@@ -313,7 +314,7 @@ class TestHooksRunnerEnv(unittest.TestCase):
     self.assertEqual(env["GANETI_HOOKS_PATH"], hpath)
     self.assertEqual(env["GANETI_OP_CODE"], self.op.OP_ID)
     self.assertEqual(env["GANETI_HOOKS_VERSION"], str(constants.HOOKS_VERSION))
-    self.assertEqual(env["GANETI_DATA_DIR"], constants.DATA_DIR)
+    self.assertEqual(env["GANETI_DATA_DIR"], pathutils.DATA_DIR)
     if "GANETI_OBJECT_TYPE" in env:
       self.assertEqual(env["GANETI_OBJECT_TYPE"], constants.HTYPE_GROUP)
     else:
@@ -322,7 +323,7 @@ class TestHooksRunnerEnv(unittest.TestCase):
   def testEmptyEnv(self):
     # Check pre-phase hook
     self.lu.hook_env = {}
-    hm = mcpu.HooksMaster(self._HooksRpc, self.lu)
+    hm = mcpu.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
     hm.RunPhase(constants.HOOKS_PHASE_PRE)
 
     (node_list, hpath, phase, env) = self._rpcs.pop(0)
@@ -348,7 +349,7 @@ class TestHooksRunnerEnv(unittest.TestCase):
     self.lu.hook_env = {
       "FOO": "pre-foo-value",
       }
-    hm = mcpu.HooksMaster(self._HooksRpc, self.lu)
+    hm = mcpu.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
     hm.RunPhase(constants.HOOKS_PHASE_PRE)
 
     (node_list, hpath, phase, env) = self._rpcs.pop(0)
@@ -395,7 +396,7 @@ class TestHooksRunnerEnv(unittest.TestCase):
       self.lu.hook_env = { name: "value" }
 
       # Test using a clean HooksMaster instance
-      hm = mcpu.HooksMaster(self._HooksRpc, self.lu)
+      hm = mcpu.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
 
       for phase in [constants.HOOKS_PHASE_PRE, constants.HOOKS_PHASE_POST]:
         self.assertRaises(AssertionError, hm.RunPhase, phase)
@@ -403,7 +404,7 @@ class TestHooksRunnerEnv(unittest.TestCase):
 
   def testNoNodes(self):
     self.lu.hook_env = {}
-    hm = mcpu.HooksMaster(self._HooksRpc, self.lu)
+    hm = mcpu.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
     hm.RunPhase(constants.HOOKS_PHASE_PRE, nodes=[])
     self.assertRaises(IndexError, self._rpcs.pop)
 
@@ -415,7 +416,7 @@ class TestHooksRunnerEnv(unittest.TestCase):
       "node93782.example.net",
       ]
 
-    hm = mcpu.HooksMaster(self._HooksRpc, self.lu)
+    hm = mcpu.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
 
     for phase in [constants.HOOKS_PHASE_PRE, constants.HOOKS_PHASE_POST]:
       hm.RunPhase(phase, nodes=nodes)
@@ -433,7 +434,7 @@ class TestHooksRunnerEnv(unittest.TestCase):
       "FOO": "value",
       }
 
-    hm = mcpu.HooksMaster(self._HooksRpc, self.lu)
+    hm = mcpu.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
     hm.RunConfigUpdate()
 
     (node_list, hpath, phase, env) = self._rpcs.pop(0)
@@ -452,7 +453,7 @@ class TestHooksRunnerEnv(unittest.TestCase):
       "FOO": "value",
       }
 
-    hm = mcpu.HooksMaster(self._HooksRpc, self.lu)
+    hm = mcpu.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
     hm.RunPhase(constants.HOOKS_PHASE_POST)
 
     (node_list, hpath, phase, env) = self._rpcs.pop(0)
@@ -470,7 +471,7 @@ class TestHooksRunnerEnv(unittest.TestCase):
     self.assertRaises(AssertionError, self.lu.BuildHooksEnv)
     self.assertRaises(AssertionError, self.lu.BuildHooksNodes)
 
-    hm = mcpu.HooksMaster(self._HooksRpc, self.lu)
+    hm = mcpu.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
     self.assertEqual(hm.pre_env, {})
     self.assertRaises(IndexError, self._rpcs.pop)
 
@@ -494,5 +495,5 @@ class TestHooksRunnerEnv(unittest.TestCase):
     assert isinstance(self.lu, FakeNoHooksLU), "LU was replaced"
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
   testutils.GanetiTestProgram()