From 92a18348dcbec3e6419cad1dd356ec445dea702d Mon Sep 17 00:00:00 2001 From: Lennart Regebro Date: Thu, 23 Jul 2015 18:00:51 +0200 Subject: [PATCH] Replace assert_called_once() calls assert_called_once() has been removed in later versions of Mock. This replaces those calls. Change-Id: I0fedeb259660681f49d49064d2e0e6648ef63077 --- tuskarclient/tests/v2/test_plans_shell.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tuskarclient/tests/v2/test_plans_shell.py b/tuskarclient/tests/v2/test_plans_shell.py index 7f3467e..5212629 100644 --- a/tuskarclient/tests/v2/test_plans_shell.py +++ b/tuskarclient/tests/v2/test_plans_shell.py @@ -176,7 +176,8 @@ class PlansShellTest(BasePlansShellTest): parameters = [{'name': 'compute-1::count', 'value': '9'}] self.shell.do_plan_scale(self.tuskar, args, outfile=self.outfile) - self.tuskar.plans.patch.assert_called_once() + self.assertEqual(self.tuskar.plans.patch.call_count, 1) + self.assertEqual('plan_uuid', self.tuskar.plans.patch.call_args[0][0]) self.assertEqual( sorted(parameters, key=lambda k: k['name']), @@ -199,7 +200,8 @@ class PlansShellTest(BasePlansShellTest): parameters = [{'name': 'compute-1::Flavor', 'value': 'baremetalssd'}] self.shell.do_plan_flavor(self.tuskar, args, outfile=self.outfile) - self.tuskar.plans.patch.assert_called_once() + self.assertEqual(self.tuskar.plans.patch.call_count, 1) + self.assertEqual('plan_uuid', self.tuskar.plans.patch.call_args[0][0]) self.assertEqual( sorted(parameters, key=lambda k: k['name']), @@ -216,7 +218,8 @@ class PlansShellTest(BasePlansShellTest): parameters = [{'name': 'foo_name', 'value': 'foo_value'}, {'name': 'bar_name', 'value': 'bar_value'}] self.shell.do_plan_patch(self.tuskar, args, outfile=self.outfile) - self.tuskar.plans.patch.assert_called_once() + self.assertEqual(self.tuskar.plans.patch.call_count, 1) + self.assertEqual('plan_uuid', self.tuskar.plans.patch.call_args[0][0]) self.assertEqual( @@ -235,7 +238,8 @@ class PlansShellTest(BasePlansShellTest): parameters = [{'name': 'foo_name', 'value': 'foo_value'}, {'name': 'bar_name', 'value': 'bar_value'}] self.shell.do_plan_patch(self.tuskar, args, outfile=self.outfile) - self.tuskar.plans.patch.assert_called_once() + self.assertEqual(self.tuskar.plans.patch.call_count, 1) + self.assertEqual('plan_uuid', self.tuskar.plans.patch.call_args[0][0]) self.assertEqual( @@ -253,7 +257,8 @@ class PlansShellTest(BasePlansShellTest): {'name': 'bar_name', 'value': 'bar_value'}] args.attributes = None self.shell.do_plan_update(self.tuskar, args, outfile=self.outfile) - self.tuskar.plans.patch.assert_called_once() + self.assertEqual(self.tuskar.plans.patch.call_count, 1) + self.assertEqual('plan_uuid', self.tuskar.plans.patch.call_args[0][0]) self.assertEqual(