summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-keystoneclient
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2017-11-10 16:30:58 -0500
committerBruce Ashfield <bruce.ashfield@windriver.com>2017-11-13 10:29:13 -0500
commit35966f24aeb513da8693ff1c9dadaeca8cc07e71 (patch)
treeb60f9b456f4e803ebf022b0135f475dca9879e4d /meta-openstack/recipes-devtools/python/python-keystoneclient
parentff44dffd5602f1f34873eadbb830b87b1b184063 (diff)
downloadmeta-cloud-services-35966f24aeb513da8693ff1c9dadaeca8cc07e71.tar.gz
python-keystoneclient: uprev to latest stable/pike
This package no longer contains bash-completions, so drop this part of the packaging. Remove old, no longer applicable patches. Update the list of runtime dependencies, based on required.txt. Requires the version update to python-django-openstack-auth. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-keystoneclient')
-rw-r--r--meta-openstack/recipes-devtools/python/python-keystoneclient/fix_keystoneclient_memory_leak.patch37
-rw-r--r--meta-openstack/recipes-devtools/python/python-keystoneclient/keystoneclient-fix-test-path-to-example-certificates.patch31
2 files changed, 0 insertions, 68 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient/fix_keystoneclient_memory_leak.patch b/meta-openstack/recipes-devtools/python/python-keystoneclient/fix_keystoneclient_memory_leak.patch
deleted file mode 100644
index 05a1d23..0000000
--- a/meta-openstack/recipes-devtools/python/python-keystoneclient/fix_keystoneclient_memory_leak.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1---
2 keystoneclient/openstack/common/apiclient/client.py | 10 ++++++++++
3 1 file changed, 10 insertions(+)
4
5--- a/keystoneclient/openstack/common/apiclient/client.py
6+++ b/keystoneclient/openstack/common/apiclient/client.py
7@@ -90,6 +90,7 @@
8 self.user_agent = user_agent or self.user_agent
9
10 self.times = [] # [("item", starttime, endtime), ...]
11+ self.times_max_len = 200
12 self.timings = timings
13
14 # requests within the same session can reuse TCP connections from pool
15@@ -142,6 +143,12 @@
16 def reset_timings(self):
17 self.times = []
18
19+ def get_timings_max_len(self):
20+ return self.times_max_len
21+
22+ def set_timings_max_len(self, new_len):
23+ self.times_max_len = new_len
24+
25 def request(self, method, url, **kwargs):
26 """Send an http request with the specified characteristics.
27
28@@ -173,6 +180,9 @@
29 if self.timings:
30 self.times.append(("%s %s" % (method, url),
31 start_time, time.time()))
32+ # remove oldest items until we maintain max length
33+ while len(self.times) > self.times_max_len:
34+ del self.times[0]
35 self._http_log_resp(resp)
36
37 if resp.status_code >= 400:
diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient/keystoneclient-fix-test-path-to-example-certificates.patch b/meta-openstack/recipes-devtools/python/python-keystoneclient/keystoneclient-fix-test-path-to-example-certificates.patch
deleted file mode 100644
index a75e1da..0000000
--- a/meta-openstack/recipes-devtools/python/python-keystoneclient/keystoneclient-fix-test-path-to-example-certificates.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From fae14f85d43da3842b2a065baf0442d61a573598 Mon Sep 17 00:00:00 2001
2From: Keith Holman <Keith.Holman@windriver.com>
3Date: Fri, 13 Jun 2014 17:08:03 -0400
4Subject: [PATCH] keystoneclient: fix test path to example certificates
5
6The tests included with keystoneclient expect them to be ran from the
7source tree. This fix changes base path of the system to where they
8are actually deployed on the system. This fix is required for some
9tests to work properly.
10
11Signed-off-by: Keith Holman <Keith.Holman@windriver.com>
12---
13 keystoneclient/tests/client_fixtures.py | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/keystoneclient/tests/client_fixtures.py b/keystoneclient/tests/client_fixtures.py
17index 1743162..6bfcb93 100644
18--- a/keystoneclient/tests/client_fixtures.py
19+++ b/keystoneclient/tests/client_fixtures.py
20@@ -25,7 +25,7 @@ from keystoneclient import utils
21
22
23 TESTDIR = os.path.dirname(os.path.abspath(__file__))
24-ROOTDIR = os.path.normpath(os.path.join(TESTDIR, '..', '..'))
25+ROOTDIR = os.path.normpath(os.path.join(TESTDIR, '..'))
26 CERTDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'certs')
27 CMSDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'cms')
28 KEYDIR = os.path.join(ROOTDIR, 'examples', 'pki', 'private')
29--
301.9.3
31