summaryrefslogtreecommitdiff
path: root/openstackclient/tests
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2014-09-05 02:00:36 -0500
committerlin-hua-cheng <os.lcheng@gmail.com>2015-04-07 23:53:31 -0700
commit0d689871b4d8c060e1d48a9472449f3d670333bb (patch)
treecdef140b5a66875ddbd9ff0ea7a561b5e2ec2b3a /openstackclient/tests
parenta9d1e3d2192aa965d15c89eb6a603faf2e95b7ec (diff)
downloadpython-openstackclient-0d689871b4d8c060e1d48a9472449f3d670333bb.tar.gz
Fix session timing
Subclass keystoneclient.session.Session to add the timing hooks to record the elapsed time returned by requests.Response objects, including the redirection history. Redirects are included individually and not rolled into the total time for the original request. This works for all clients that use OSC's session. Closes-Bug: #1402577 Change-Id: I9360c90c151579b89a37edb8c11c17feb15b3cb9
Diffstat (limited to 'openstackclient/tests')
-rw-r--r--openstackclient/tests/common/test_timing.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/openstackclient/tests/common/test_timing.py b/openstackclient/tests/common/test_timing.py
index aa910b91..a7f93b55 100644
--- a/openstackclient/tests/common/test_timing.py
+++ b/openstackclient/tests/common/test_timing.py
@@ -13,14 +13,15 @@
"""Test Timing pseudo-command"""
+import datetime
+
from openstackclient.common import timing
from openstackclient.tests import fakes
from openstackclient.tests import utils
timing_url = 'GET http://localhost:5000'
-timing_start = 1404802774.872809
-timing_end = 1404802775.724802
+timing_elapsed = 0.872809
class FakeGenericClient(object):
@@ -66,9 +67,10 @@ class TestTiming(utils.TestCommand):
self.assertEqual(datalist, data)
def test_timing_list(self):
- self.app.timing_data = [
- (timing_url, timing_start, timing_end),
- ]
+ self.app.timing_data = [(
+ timing_url,
+ datetime.timedelta(microseconds=timing_elapsed*1000000),
+ )]
arglist = []
verifylist = []
@@ -79,9 +81,8 @@ class TestTiming(utils.TestCommand):
collist = ('URL', 'Seconds')
self.assertEqual(collist, columns)
- timing_sec = timing_end - timing_start
datalist = [
- (timing_url, timing_sec),
- ('Total', timing_sec)
+ (timing_url, timing_elapsed),
+ ('Total', timing_elapsed),
]
self.assertEqual(datalist, data)