openstack/deb-ceilometer
Code Issues Proposed changes

Remove test skipping logic.

Browse Source 
We have a patch going into MIM to support the type of
query that made us need a real MongoDB so we can remove
these skips.

Change-Id: Ieb481492d654031edddfc7506e404fa0e0f2c2f0
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
This commit is contained in:
Doug Hellmann 2012-08-16 11:29:15 -04:00
parent 7eaf0247c7
commit 2163a1689e
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/storage/test_impl_mongodb.py
View File

@ -53,9 +53,8 @@ import unittest
from ming import mim
import mox
from nose.plugins import skip
from nova import test
from nose.plugins import skip
from ceilometer import counter
from ceilometer import meter
@ -182,7 +181,11 @@ class UserTest(MongoDBEngineTestBase):
def test_get_users(self):
users = self.conn.get_users()
assert set(users) == set(['user-id', 'user-id-alternate', 'user-id-2', 'user-id-3'])
assert set(users) == set(['user-id',
'user-id-alternate',
'user-id-2',
'user-id-3',
])
def test_get_users_by_source(self):
users = list(self.conn.get_users(source='test-1'))
@ -270,7 +273,6 @@ class ResourceTest(MongoDBEngineTestBase):
expected = set(['resource-id', 'resource-id-alternate'])
assert set(resource_ids) == expected
@test.skip_if(not FORCING_MONGO, 'Requires real MongoDB test database')
def test_get_resources_both_timestamps(self):
start_ts = datetime.datetime(2012, 7, 2, 10, 42)
end_ts = datetime.datetime(2012, 7, 2, 10, 43)
@ -349,7 +351,6 @@ class MeterTest(MongoDBEngineTestBase):
assert length == 1
assert results[0]['timestamp'] == datetime.datetime(2012, 7, 2, 10, 40)
@test.skip_if(not FORCING_MONGO, 'Requires real MongoDB test database')
def test_get_raw_events_by_both_times(self):
f = storage.EventFilter(
start=datetime.datetime(2012, 7, 2, 10, 42),

2
tools/test-requires
View File

@ -6,7 +6,7 @@ mox
glance>=2011.3.1
python-glanceclient
# NOTE(dhellmann): Ming is necessary to provide the Mongo-in-memory
# implementation for of MongoDB. The original source for Ming is at
# implementation of MongoDB. The original source for Ming is at
# http://sourceforge.net/project/merciless but there does not seem to
# be a way to point to a "zipball" of the latest HEAD there, and we
# need features present only in that version. I forked the project to