From e3f0d522bafddfb996a3094bc66edbae5173652a Mon Sep 17 00:00:00 2001
From: gong yong sheng <gong.yongsheng@99cloud.net>
Date: Wed, 12 Oct 2016 22:08:22 +0800
Subject: [PATCH] make python34 CI job to pass
remove _get_attr_metadata monkey_patch since it is for XML test.
remove iterkeys() call which is not py3.x compatible.
Change-Id: I46df0a3748f470521553793111a21eea72bd7663
Closes-bug: 1632714
---
tackerclient/tacker/v1_0/__init__.py | 2 +-
tackerclient/tests/unit/test_cli10.py | 11 -----------
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/tackerclient/tacker/v1_0/__init__.py b/tackerclient/tacker/v1_0/__init__.py
index 6d5047a1..c543d6d0 100644
--- a/tackerclient/tacker/v1_0/__init__.py
+++ b/tackerclient/tacker/v1_0/__init__.py
@@ -284,7 +284,7 @@ def parse_args_to_dict(values_specs):
_args = _parser.parse_args(_values_specs)
result_dict = {}
- for opt in _options.iterkeys():
+ for opt in _options.keys():
_opt = opt.split('--', 2)[1]
_opt = _opt.replace('-', '_')
_value = getattr(_args, _opt)
diff --git a/tackerclient/tests/unit/test_cli10.py b/tackerclient/tests/unit/test_cli10.py
index c123ee2e..e88d641a 100644
--- a/tackerclient/tests/unit/test_cli10.py
+++ b/tackerclient/tests/unit/test_cli10.py
@@ -179,14 +179,6 @@ class CLITestV10Base(testtools.TestCase):
def _find_resourceid(self, client, resource, name_or_id):
return name_or_id
- def _get_attr_metadata(self):
- return self.metadata
- client.Client.EXTED_PLURALS.update(constants.PLURALS)
- client.Client.EXTED_PLURALS.update({'tags': 'tag'})
- return {'plurals': client.Client.EXTED_PLURALS,
- 'xmlns': constants.XML_NS_V10,
- constants.EXT_NS: {'prefix': 'http://xxxx.yy.com'}}
-
def setUp(self, plurals={}):
"""Prepare the test environment."""
super(CLITestV10Base, self).setUp()
@@ -205,9 +197,6 @@ class CLITestV10Base(testtools.TestCase):
self.useFixture(fixtures.MonkeyPatch(
'tackerclient.tacker.v1_0.find_resourceid_by_id',
self._find_resourceid))
- self.useFixture(fixtures.MonkeyPatch(
- 'tackerclient.v1_0.client.Client.get_attr_metadata',
- self._get_attr_metadata))
self.client = client.Client(token=TOKEN, endpoint_url=self.endurl)
@mock.patch.object(TackerCommand, 'get_client')