diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-17 20:47:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-17 20:47:55 +0000 |
| commit | cb681706fa5da9bf7ab4ebf9c4500896b2f90ca0 (patch) | |
| tree | c476aaa5591f14f50a9392224a88be0de4af7b66 /openstackclient/tests | |
| parent | 6c4f81516c6ad119d39c4952f3ab274f3d3f2efa (diff) | |
| parent | 0d689871b4d8c060e1d48a9472449f3d670333bb (diff) | |
| download | python-openstackclient-cb681706fa5da9bf7ab4ebf9c4500896b2f90ca0.tar.gz | |
Merge "Fix session timing"
Diffstat (limited to 'openstackclient/tests')
| -rw-r--r-- | openstackclient/tests/common/test_timing.py | 17 |
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) |