openstack/aodh
Code Issues Proposed changes

Merge "Fix incorrect use of timestamp in test"

Browse Source
This commit is contained in:
Jenkins 2014-07-17 12:22:46 +00:00 committed by Gerrit Code Review
commit 33d3a96822
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ceilometer/tests/network/statistics/test_statistics.py
View File

@ -13,6 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import datetime
from ceilometer.network import statistics
from ceilometer.network.statistics import driver
from ceilometer.openstack.common import test
@ -91,7 +93,9 @@ class TestBaseGetSamples(test.BaseTestCase):
return FakeDriver
def _make_timestamps(self, count):
return [timeutils.isotime() for i in range(count)]
now = timeutils.utcnow()
return [timeutils.isotime(now + datetime.timedelta(seconds=i))
for i in range(count)]
def _get_samples(self, *resources):
@ -134,7 +138,7 @@ class TestBaseGetSamples(test.BaseTestCase):
samples = self._get_samples('http://foo', 'http://bar')
self.assertEqual(len(samples), 2)
self._assert_sample(samples[0], 1, 'a', {'spam': 'egg'}, times[2])
self._assert_sample(samples[0], 1, 'a', {'spam': 'egg'}, times[0])
self._assert_sample(samples[1], 2, 'b', None, times[1])
def test_get_samples_two_driver_one_resource(self):