On Thu, Mar 05, 2015 at 11:10:58PM +0100, 'Helga Velroyen' via ganeti-devel
wrote:
For better LURenewCrypto unit tests, we need to be able to
mock the pathutils module. This makes it necessary to add
some support to the testutils for patching this module.
Signed-off-by: Helga Velroyen <[email protected]>
---
Makefile.am | 1 +
test/py/cmdlib/testsupport/__init__.py | 2 ++
test/py/cmdlib/testsupport/pathutils_mock.py | 48 ++++++++++++++++++++++++++++
3 files changed, 51 insertions(+)
create mode 100644 test/py/cmdlib/testsupport/pathutils_mock.py
diff --git a/Makefile.am b/Makefile.am
index bda85d4..a384351 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1574,6 +1574,7 @@ python_test_support = \
test/py/cmdlib/testsupport/iallocator_mock.py \
test/py/cmdlib/testsupport/lock_manager_mock.py \
test/py/cmdlib/testsupport/netutils_mock.py \
+ test/py/cmdlib/testsupport/pathutils_mock.py \
test/py/cmdlib/testsupport/processor_mock.py \
test/py/cmdlib/testsupport/rpc_runner_mock.py \
test/py/cmdlib/testsupport/ssh_mock.py \
diff --git a/test/py/cmdlib/testsupport/__init__.py
b/test/py/cmdlib/testsupport/__init__.py
index 38370d3..d121c37 100644
--- a/test/py/cmdlib/testsupport/__init__.py
+++ b/test/py/cmdlib/testsupport/__init__.py
@@ -40,6 +40,7 @@ from cmdlib.testsupport.utils_mock import patchUtils
from cmdlib.testsupport.lock_manager_mock import LockManagerMock
from cmdlib.testsupport.netutils_mock import patchNetutils, HostnameMock
from cmdlib.testsupport.processor_mock import ProcessorMock
+from cmdlib.testsupport.pathutils_mock import patchPathutils
from cmdlib.testsupport.rpc_runner_mock import CreateRpcRunnerMock, \
RpcResultsBuilder
from cmdlib.testsupport.ssh_mock import patchSsh
@@ -53,6 +54,7 @@ __all__ = ["CmdlibTestCase",
"patchUtils",
"patchNetutils",
"patchSsh",
+ "patchPathutils",
"LockManagerMock",
"ProcessorMock",
"RpcResultsBuilder",
diff --git a/test/py/cmdlib/testsupport/pathutils_mock.py
b/test/py/cmdlib/testsupport/pathutils_mock.py
new file mode 100644
index 0000000..9e59dc4
--- /dev/null
+++ b/test/py/cmdlib/testsupport/pathutils_mock.py
@@ -0,0 +1,48 @@
+#
+#
+
+# Copyright (C) 2015 Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+"""Support for mocking the ssh module"""
+
+
+from cmdlib.testsupport.util import patchModule
+
+
+# pylint: disable=C0103
+def patchPathutils(module_under_test):
+ """Patches the L{ganeti.pathutils} module for tests.
+
+ This function is meant to be used as a decorator for test methods.
+
+ @type module_under_test: string
+ @param module_under_test: the module within cmdlib which is tested. The
+ "ganeti.cmdlib" prefix is optional.
+
+ """
+ return patchModule(module_under_test, "pathutils")
--
2.2.0.rc0.207.ga3a616c
LGTM
