[checkmk-commits] AWS fake clients: Simplified indexing

Module: check_mk Branch: master Commit: ce1af130974a30dd5593547820ce3225dc0fd0d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce1af130974a30… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 25 12:21:26 2019 +0200 AWS fake clients: Simplified indexing Change-Id: I290e3a173ee4c5f2d8ecec45e7c7599e2569af93 --- tests/unit/cmk/special_agents/agent_aws/agent_aws_fake_clients.py | 7 ++----- tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/unit/cmk/special_agents/agent_aws/agent_aws_fake_clients.py b/tests/unit/cmk/special_agents/agent_aws/agent_aws_fake_clients.py index b4d72c6..fd3067a 100644 --- a/tests/unit/cmk/special_agents/agent_aws/agent_aws_fake_clients.py +++ b/tests/unit/cmk/special_agents/agent_aws/agent_aws_fake_clients.py @@ -40,13 +40,10 @@ class List(Entity): list_ = [] for choice in self._from_choice.choices: elem = {self._from_choice.key: choice} - elem.update( - {e.key: e.create("%s-%s" % (idx, choice), amount) for e in self._elements}) + elem.update({e.key: e.create(choice, amount) for e in self._elements}) list_.append(elem) return list_ - return [{e.key: e.create("%s-%s" % (idx, x), amount) - for e in self._elements} - for x in xrange(amount)] + return [{e.key: e.create(x, amount) for e in self._elements} for x in xrange(amount)] class Dict(Entity): diff --git a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py index 66c5617..c012bb7 100644 --- a/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py +++ b/tests/unit/cmk/special_agents/agent_aws/test_agent_aws_elb.py @@ -91,9 +91,9 @@ elb_params = [ ((None, None), ['LoadBalancerName-0', 'LoadBalancerName-1', 'LoadBalancerName-2'], ['LoadBalancerName-0', 'LoadBalancerName-1']), (([['FOO']], [['BAR']]), [], []), - (([['Key-0-0']], [['Value-0-0']]), ['LoadBalancerName-0', 'LoadBalancerName-1'], + (([['Key-0']], [['Value-0']]), ['LoadBalancerName-0', 'LoadBalancerName-1'], ['LoadBalancerName-0', 'LoadBalancerName-1']), - (([['Key-0-0', 'Foo']], [['Value-0-0', 'Bar']]), ['LoadBalancerName-0', 'LoadBalancerName-1'], + (([['Key-0', 'Foo']], [['Value-0', 'Bar']]), ['LoadBalancerName-0', 'LoadBalancerName-1'], ['LoadBalancerName-0', 'LoadBalancerName-1']), ]