x/python-tuskarclient
Code Issues Proposed changes

Replace assert_called_once() calls

Browse Source 
assert_called_once() has been removed in later versions of Mock.
This replaces those calls.

Change-Id: I0fedeb259660681f49d49064d2e0e6648ef63077
This commit is contained in:
Lennart Regebro 2015-07-23 18:00:51 +02:00 committed by Lennart Regebro
parent 9e051c620a
commit 92a18348dc
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tuskarclient/tests/v2/test_plans_shell.py
View File

@ -176,7 +176,8 @@ class PlansShellTest(BasePlansShellTest):
parameters = [{'name': 'compute-1::count', 'value': '9'}] parameters = [{'name': 'compute-1::count', 'value': '9'}]
self.shell.do_plan_scale(self.tuskar, args, outfile=self.outfile) 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('plan_uuid', self.tuskar.plans.patch.call_args[0][0])
self.assertEqual( self.assertEqual(
sorted(parameters, key=lambda k: k['name']), sorted(parameters, key=lambda k: k['name']),
@ -199,7 +200,8 @@ class PlansShellTest(BasePlansShellTest):
parameters = [{'name': 'compute-1::Flavor', 'value': 'baremetalssd'}] parameters = [{'name': 'compute-1::Flavor', 'value': 'baremetalssd'}]
self.shell.do_plan_flavor(self.tuskar, args, outfile=self.outfile) 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('plan_uuid', self.tuskar.plans.patch.call_args[0][0])
self.assertEqual( self.assertEqual(
sorted(parameters, key=lambda k: k['name']), sorted(parameters, key=lambda k: k['name']),
@ -216,7 +218,8 @@ class PlansShellTest(BasePlansShellTest):
parameters = [{'name': 'foo_name', 'value': 'foo_value'}, parameters = [{'name': 'foo_name', 'value': 'foo_value'},
{'name': 'bar_name', 'value': 'bar_value'}] {'name': 'bar_name', 'value': 'bar_value'}]
self.shell.do_plan_patch(self.tuskar, args, outfile=self.outfile) 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.assertEqual('plan_uuid',
self.tuskar.plans.patch.call_args[0][0]) self.tuskar.plans.patch.call_args[0][0])
self.assertEqual( self.assertEqual(
@ -235,7 +238,8 @@ class PlansShellTest(BasePlansShellTest):
parameters = [{'name': 'foo_name', 'value': 'foo_value'}, parameters = [{'name': 'foo_name', 'value': 'foo_value'},
{'name': 'bar_name', 'value': 'bar_value'}] {'name': 'bar_name', 'value': 'bar_value'}]
self.shell.do_plan_patch(self.tuskar, args, outfile=self.outfile) 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.assertEqual('plan_uuid',
self.tuskar.plans.patch.call_args[0][0]) self.tuskar.plans.patch.call_args[0][0])
self.assertEqual( self.assertEqual(
@ -253,7 +257,8 @@ class PlansShellTest(BasePlansShellTest):
{'name': 'bar_name', 'value': 'bar_value'}] {'name': 'bar_name', 'value': 'bar_value'}]
args.attributes = None args.attributes = None
self.shell.do_plan_update(self.tuskar, args, outfile=self.outfile) 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.assertEqual('plan_uuid',
self.tuskar.plans.patch.call_args[0][0]) self.tuskar.plans.patch.call_args[0][0])
self.assertEqual( self.assertEqual(