openstack/aodh
Code Issues Proposed changes

Merge "Fix an invalid test in the storage test suite"

Browse Source
This commit is contained in:
Jenkins 2013-03-06 14:30:39 +00:00 committed by Gerrit Code Review
commit 54432375ac
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tests/storage/base.py
View File

@ -804,23 +804,23 @@ class StatisticsTest(DBTestBase):
self.assertEqual(set(r['period_end'] for r in results), self.assertEqual(set(r['period_end'] for r in results),
set([datetime.datetime(2012, 9, 25, 12, 28), set([datetime.datetime(2012, 9, 25, 12, 28),
datetime.datetime(2012, 9, 25, 14, 28)])) datetime.datetime(2012, 9, 25, 14, 28)]))
for r in results: r = results[0]
if r['period_start'] == datetime.datetime(2012, 9, 25, 10, 0): self.assertEqual(r['period_start'],
self.assertEqual(r['count'], 2) datetime.datetime(2012, 9, 25, 10, 28))
self.assertEqual(r['avg'], 8.5) self.assertEqual(r['count'], 2)
self.assertEqual(r['min'], 8) self.assertEqual(r['avg'], 8.5)
self.assertEqual(r['max'], 9) self.assertEqual(r['min'], 8)
self.assertEqual(r['sum'], 17) self.assertEqual(r['max'], 9)
self.assertEqual(r['period'], 7200) self.assertEqual(r['sum'], 17)
self.assertEqual(isinstance(r['period'], int)) self.assertEqual(r['period'], 7200)
self.assertEqual(r['period_end'], self.assertIsInstance(r['period'], int)
r['period_start'] expected_end = r['period_start'] + datetime.timedelta(seconds=7200)
+ datetime.timedelta(seconds=7200)) self.assertEqual(r['period_end'], expected_end)
self.assertEqual(r['duration'], 3660) self.assertEqual(r['duration'], 3660)
self.assertEqual(r['duration_start'], self.assertEqual(r['duration_start'],
datetime.datetime(2012, 9, 25, 10, 30)) datetime.datetime(2012, 9, 25, 10, 30))
self.assertEqual(r['duration_end'], self.assertEqual(r['duration_end'],
datetime.datetime(2012, 9, 25, 11, 31)) datetime.datetime(2012, 9, 25, 11, 31))
def test_by_project(self): def test_by_project(self):
f = storage.EventFilter( f = storage.EventFilter(