On Thu, Nov 20, 2014 at 2:37 PM, 'Aaron Karper' via ganeti-devel
<ganeti-devel@googlegroups.com> wrote:
> In order to allow us to check if cmdlib acquire locks correctly, we need
> to store the information.
>
> Signed-off-by: Aaron Karper <akar...@google.com>
> ---
> test/py/cmdlib/testsupport/cmdlib_testcase.py | 5 +++--
> test/py/cmdlib/testsupport/processor_mock.py | 4 ++--
> test/py/cmdlib/testsupport/wconfd_mock.py | 2 ++
> 3 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/test/py/cmdlib/testsupport/cmdlib_testcase.py
> b/test/py/cmdlib/testsupport/cmdlib_testcase.py
> index 76b57d1..21211b4 100644
> --- a/test/py/cmdlib/testsupport/cmdlib_testcase.py
> +++ b/test/py/cmdlib/testsupport/cmdlib_testcase.py
> @@ -193,7 +193,8 @@ class CmdlibTestCase(testutils.GanetiTestCase):
> self.cfg = ConfigMock()
> self.rpc = CreateRpcRunnerMock()
> self.ctx = GanetiContextMock(self)
> - self.mcpu = ProcessorMock(self.ctx)
> + self.wconfd = WConfdMock()
> + self.mcpu = ProcessorMock(self.ctx, self.wconfd)
>
> self._StopPatchers()
> try:
> @@ -234,7 +235,7 @@ class CmdlibTestCase(testutils.GanetiTestCase):
>
> """
> return MockLU(self.mcpu, mock.MagicMock(), self.ctx, self.cfg, self.rpc,
> - (1234, "/tmp/mock/livelock"), WConfdMock())
> + (1234, "/tmp/mock/livelock"), self.wconfd)
>
> def RpcResultsBuilder(self, use_node_names=False):
> """Creates a pre-configured L{RpcResultBuilder}
> diff --git a/test/py/cmdlib/testsupport/processor_mock.py
> b/test/py/cmdlib/testsupport/processor_mock.py
> index 3f3b250..3cf8383 100644
> --- a/test/py/cmdlib/testsupport/processor_mock.py
> +++ b/test/py/cmdlib/testsupport/processor_mock.py
> @@ -77,11 +77,11 @@ class ProcessorMock(mcpu.Processor):
>
> """
>
> - def __init__(self, context):
> + def __init__(self, context, wconfd):
> super(ProcessorMock, self).__init__(context, 1, True)
> self.log_entries = []
> self._lu_test_func = None
> - self.wconfd = WConfdMock()
> + self.wconfd = wconfd
>
> def ExecOpCodeAndRecordOutput(self, op):
> """Executes the given opcode and records the output for further
> inspection.
> diff --git a/test/py/cmdlib/testsupport/wconfd_mock.py
> b/test/py/cmdlib/testsupport/wconfd_mock.py
> index e7d818f..c595f9d 100644
> --- a/test/py/cmdlib/testsupport/wconfd_mock.py
> +++ b/test/py/cmdlib/testsupport/wconfd_mock.py
> @@ -47,6 +47,7 @@ class MockClient(object):
> del self.wconfdmock.mylocks[lockrq[0]]
> else:
> self.wconfdmock.mylocks[lockrq[0]] = lockrq[1]
> + self.wconfdmock.all_locks[lockrq[0]] = lockrq[1]
> return []
>
> def UpdateLocksWaiting(self, cid, _prio, req):
> @@ -88,6 +89,7 @@ class WConfdMock(object):
> """
> def __init__(self):
> self.mylocks = {}
> + self.all_locks = {}
>
> def Client(self):
> return MockClient(self)
> --
> 2.1.0.rc2.206.gedb03e5
>
LGTM, thanks.
Michele
--
Google Germany GmbH
Dienerstr. 12
80331 München
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschäftsführer: Graham Law, Christine Elizabeth Flores
