summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/api/v1/max_project_volume.py2
-rw-r--r--tests/api/v1/test_max_resource_volume.py2
-rw-r--r--tests/api/v1/test_sum_project_volume.py2
-rw-r--r--tests/api/v1/test_sum_resource_volume.py2
-rw-r--r--tests/api/v2/test_max_project_volume.py2
-rw-r--r--tests/api/v2/test_max_resource_volume.py2
-rw-r--r--tests/api/v2/test_sum_project_volume.py2
-rw-r--r--tests/api/v2/test_sum_resource_volume.py2
-rw-r--r--tests/storage/test_impl_mongodb.py3
9 files changed, 9 insertions, 10 deletions
diff --git a/tests/api/v1/max_project_volume.py b/tests/api/v1/max_project_volume.py
index bfccc3b9..121513ff 100644
--- a/tests/api/v1/max_project_volume.py
+++ b/tests/api/v1/max_project_volume.py
@@ -27,7 +27,7 @@ from ceilometer.collector import meter
from ceilometer import counter
from ceilometer.tests import api as tests_api
-from ceilometer.tests.db import require_map_reduce
+from ceilometer.storage.impl_test import require_map_reduce
class TestMaxProjectVolume(tests_api.TestBase):
diff --git a/tests/api/v1/test_max_resource_volume.py b/tests/api/v1/test_max_resource_volume.py
index 92785d5b..85f0d007 100644
--- a/tests/api/v1/test_max_resource_volume.py
+++ b/tests/api/v1/test_max_resource_volume.py
@@ -26,7 +26,7 @@ from ceilometer.collector import meter
from ceilometer import counter
from ceilometer.tests import api as tests_api
-from ceilometer.tests.db import require_map_reduce
+from ceilometer.storage.impl_test import require_map_reduce
class TestMaxResourceVolume(tests_api.TestBase):
diff --git a/tests/api/v1/test_sum_project_volume.py b/tests/api/v1/test_sum_project_volume.py
index d4f35d2a..7ee6e10a 100644
--- a/tests/api/v1/test_sum_project_volume.py
+++ b/tests/api/v1/test_sum_project_volume.py
@@ -27,7 +27,7 @@ from ceilometer.collector import meter
from ceilometer import counter
from ceilometer.tests import api as tests_api
-from ceilometer.tests.db import require_map_reduce
+from ceilometer.storage.impl_test import require_map_reduce
class TestSumProjectVolume(tests_api.TestBase):
diff --git a/tests/api/v1/test_sum_resource_volume.py b/tests/api/v1/test_sum_resource_volume.py
index 19f91763..3af09e29 100644
--- a/tests/api/v1/test_sum_resource_volume.py
+++ b/tests/api/v1/test_sum_resource_volume.py
@@ -27,7 +27,7 @@ from ceilometer.collector import meter
from ceilometer import counter
from ceilometer.tests import api as tests_api
-from ceilometer.tests.db import require_map_reduce
+from ceilometer.storage.impl_test import require_map_reduce
class TestSumResourceVolume(tests_api.TestBase):
diff --git a/tests/api/v2/test_max_project_volume.py b/tests/api/v2/test_max_project_volume.py
index fa4515bd..ee0c8320 100644
--- a/tests/api/v2/test_max_project_volume.py
+++ b/tests/api/v2/test_max_project_volume.py
@@ -25,7 +25,7 @@ from oslo.config import cfg
from ceilometer.collector import meter
from ceilometer import counter
-from ceilometer.tests.db import require_map_reduce
+from ceilometer.storage.impl_test import require_map_reduce
from .base import FunctionalTest
diff --git a/tests/api/v2/test_max_resource_volume.py b/tests/api/v2/test_max_resource_volume.py
index a2c5d440..a8fd65da 100644
--- a/tests/api/v2/test_max_resource_volume.py
+++ b/tests/api/v2/test_max_resource_volume.py
@@ -26,7 +26,7 @@ from ceilometer.collector import meter
from ceilometer import counter
from .base import FunctionalTest
-from ceilometer.tests.db import require_map_reduce
+from ceilometer.storage.impl_test import require_map_reduce
class TestMaxResourceVolume(FunctionalTest):
diff --git a/tests/api/v2/test_sum_project_volume.py b/tests/api/v2/test_sum_project_volume.py
index 83c73875..92876c6e 100644
--- a/tests/api/v2/test_sum_project_volume.py
+++ b/tests/api/v2/test_sum_project_volume.py
@@ -26,7 +26,7 @@ from ceilometer.collector import meter
from ceilometer import counter
from .base import FunctionalTest
-from ceilometer.tests.db import require_map_reduce
+from ceilometer.storage.impl_test import require_map_reduce
class TestSumProjectVolume(FunctionalTest):
diff --git a/tests/api/v2/test_sum_resource_volume.py b/tests/api/v2/test_sum_resource_volume.py
index 1e645f2a..7d692544 100644
--- a/tests/api/v2/test_sum_resource_volume.py
+++ b/tests/api/v2/test_sum_resource_volume.py
@@ -26,7 +26,7 @@ from ceilometer.collector import meter
from ceilometer import counter
from .base import FunctionalTest
-from ceilometer.tests.db import require_map_reduce
+from ceilometer.storage.impl_test import require_map_reduce
class TestSumResourceVolume(FunctionalTest):
diff --git a/tests/storage/test_impl_mongodb.py b/tests/storage/test_impl_mongodb.py
index 88e1febd..4d775955 100644
--- a/tests/storage/test_impl_mongodb.py
+++ b/tests/storage/test_impl_mongodb.py
@@ -54,8 +54,7 @@ from tests.storage import base
from ceilometer.collector import meter
from ceilometer import counter
-from ceilometer.storage.impl_test import TestConnection
-from ceilometer.tests.db import require_map_reduce
+from ceilometer.storage.impl_test import TestConnection, require_map_reduce
class MongoDBEngine(base.DBEngineBase):