diff options
author | Louis Taylor <louis@kragniz.eu> | 2015-04-18 23:59:04 +0100 |
---|---|---|
committer | Louis Taylor <louis@kragniz.eu> | 2015-06-12 15:15:10 +0000 |
commit | 0ae8f4102e7aeebb75fe5f65c02ed9bfa76cebb5 (patch) | |
tree | 59dcff87f762b625985bc1e77074e7e49ebc6911 | |
parent | 65b9489e19ce6c9bf958db471dacf307820050f2 (diff) | |
download | glance_store-0ae8f4102e7aeebb75fe5f65c02ed9bfa76cebb5.tar.gz |
Move glance_store tests into the main package
We're moving glanceclient tests into the analogous directory, so we
should standardize and do the same in glance_store.
Change-Id: Icdcca1bd55be2d1ba8546bebf7ca1db72c183198
-rw-r--r-- | .testr.conf | 2 | ||||
-rw-r--r-- | glance_store/tests/unit/__init__.py (renamed from tests/__init__.py) | 0 | ||||
-rw-r--r-- | glance_store/tests/unit/test_cinder_store.py (renamed from tests/unit/test_cinder_store.py) | 2 | ||||
-rw-r--r-- | glance_store/tests/unit/test_filesystem_store.py (renamed from tests/unit/test_filesystem_store.py) | 2 | ||||
-rw-r--r-- | glance_store/tests/unit/test_gridfs_store.py (renamed from tests/unit/test_gridfs_store.py) | 2 | ||||
-rw-r--r-- | glance_store/tests/unit/test_http_store.py (renamed from tests/unit/test_http_store.py) | 2 | ||||
-rw-r--r-- | glance_store/tests/unit/test_opts.py (renamed from tests/unit/test_opts.py) | 0 | ||||
-rw-r--r-- | glance_store/tests/unit/test_rbd_store.py (renamed from tests/unit/test_rbd_store.py) | 2 | ||||
-rw-r--r-- | glance_store/tests/unit/test_s3_store.py (renamed from tests/unit/test_s3_store.py) | 2 | ||||
-rw-r--r-- | glance_store/tests/unit/test_sheepdog_store.py (renamed from tests/unit/test_sheepdog_store.py) | 2 | ||||
-rw-r--r-- | glance_store/tests/unit/test_store_base.py (renamed from tests/unit/test_store_base.py) | 0 | ||||
-rw-r--r-- | glance_store/tests/unit/test_store_capabilities.py (renamed from tests/unit/test_store_capabilities.py) | 0 | ||||
-rw-r--r-- | glance_store/tests/unit/test_swift_store.py (renamed from tests/unit/test_swift_store.py) | 2 | ||||
-rw-r--r-- | glance_store/tests/unit/test_swift_store_utils.py (renamed from tests/unit/test_swift_store_utils.py) | 0 | ||||
-rw-r--r-- | glance_store/tests/unit/test_utils.py (renamed from tests/unit/test_utils.py) | 0 | ||||
-rw-r--r-- | glance_store/tests/unit/test_vmware_store.py (renamed from tests/unit/test_vmware_store.py) | 2 | ||||
-rw-r--r-- | tests/unit/__init__.py | 0 |
17 files changed, 10 insertions, 10 deletions
diff --git a/.testr.conf b/.testr.conf index d3026e8..c3535ef 100644 --- a/.testr.conf +++ b/.testr.conf @@ -2,7 +2,7 @@ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-160} \ - ${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION + ${PYTHON:-python} -m subunit.run discover -t ./ ./glance_store/tests/unit $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list diff --git a/tests/__init__.py b/glance_store/tests/unit/__init__.py index e69de29..e69de29 100644 --- a/tests/__init__.py +++ b/glance_store/tests/unit/__init__.py diff --git a/tests/unit/test_cinder_store.py b/glance_store/tests/unit/test_cinder_store.py index c2b5c15..069c716 100644 --- a/tests/unit/test_cinder_store.py +++ b/glance_store/tests/unit/test_cinder_store.py @@ -22,7 +22,7 @@ from glance_store._drivers import cinder from glance_store import exceptions from glance_store import location from glance_store.tests import base -from tests.unit import test_store_capabilities +from glance_store.tests.unit import test_store_capabilities class FakeObject(object): diff --git a/tests/unit/test_filesystem_store.py b/glance_store/tests/unit/test_filesystem_store.py index 870b4e3..f5ef3db 100644 --- a/tests/unit/test_filesystem_store.py +++ b/glance_store/tests/unit/test_filesystem_store.py @@ -35,7 +35,7 @@ from glance_store._drivers.filesystem import Store from glance_store import exceptions from glance_store import location from glance_store.tests import base -from tests.unit import test_store_capabilities +from glance_store.tests.unit import test_store_capabilities class TestStore(base.StoreBaseTest, diff --git a/tests/unit/test_gridfs_store.py b/glance_store/tests/unit/test_gridfs_store.py index c39c5f5..066b0b8 100644 --- a/tests/unit/test_gridfs_store.py +++ b/glance_store/tests/unit/test_gridfs_store.py @@ -20,7 +20,7 @@ import six from glance_store._drivers import gridfs as gfs from glance_store.tests import base -from tests.unit import test_store_capabilities +from glance_store.tests.unit import test_store_capabilities GRIDFS_CONF = {'mongodb_store_uri': 'mongodb://fake_store_uri', diff --git a/tests/unit/test_http_store.py b/glance_store/tests/unit/test_http_store.py index 1cbe8c9..6ab4db6 100644 --- a/tests/unit/test_http_store.py +++ b/glance_store/tests/unit/test_http_store.py @@ -20,8 +20,8 @@ from glance_store._drivers import http from glance_store import exceptions from glance_store import location from glance_store.tests import base +from glance_store.tests.unit import test_store_capabilities from glance_store.tests import utils -from tests.unit import test_store_capabilities class TestHttpStore(base.StoreBaseTest, diff --git a/tests/unit/test_opts.py b/glance_store/tests/unit/test_opts.py index 5559dec..5559dec 100644 --- a/tests/unit/test_opts.py +++ b/glance_store/tests/unit/test_opts.py diff --git a/tests/unit/test_rbd_store.py b/glance_store/tests/unit/test_rbd_store.py index 6bda898..272f463 100644 --- a/tests/unit/test_rbd_store.py +++ b/glance_store/tests/unit/test_rbd_store.py @@ -21,7 +21,7 @@ from glance_store._drivers import rbd as rbd_store from glance_store import exceptions from glance_store.location import Location from glance_store.tests import base -from tests.unit import test_store_capabilities +from glance_store.tests.unit import test_store_capabilities class MockRados(object): diff --git a/tests/unit/test_s3_store.py b/glance_store/tests/unit/test_s3_store.py index 5d58573..a15fcf0 100644 --- a/tests/unit/test_s3_store.py +++ b/glance_store/tests/unit/test_s3_store.py @@ -29,7 +29,7 @@ from glance_store import capabilities from glance_store import exceptions from glance_store import location from glance_store.tests import base -from tests.unit import test_store_capabilities +from glance_store.tests.unit import test_store_capabilities FAKE_UUID = str(uuid.uuid4()) diff --git a/tests/unit/test_sheepdog_store.py b/glance_store/tests/unit/test_sheepdog_store.py index a849fd5..39f8e05 100644 --- a/tests/unit/test_sheepdog_store.py +++ b/glance_store/tests/unit/test_sheepdog_store.py @@ -21,7 +21,7 @@ from glance_store._drivers import sheepdog from glance_store import exceptions from glance_store import location from glance_store.tests import base -from tests.unit import test_store_capabilities +from glance_store.tests.unit import test_store_capabilities class TestSheepdogStore(base.StoreBaseTest, diff --git a/tests/unit/test_store_base.py b/glance_store/tests/unit/test_store_base.py index 4b40b5a..4b40b5a 100644 --- a/tests/unit/test_store_base.py +++ b/glance_store/tests/unit/test_store_base.py diff --git a/tests/unit/test_store_capabilities.py b/glance_store/tests/unit/test_store_capabilities.py index 1258481..1258481 100644 --- a/tests/unit/test_store_capabilities.py +++ b/glance_store/tests/unit/test_store_capabilities.py diff --git a/tests/unit/test_swift_store.py b/glance_store/tests/unit/test_swift_store.py index bdfc8aa..d4547c8 100644 --- a/tests/unit/test_swift_store.py +++ b/glance_store/tests/unit/test_swift_store.py @@ -42,7 +42,7 @@ from glance_store.common import utils from glance_store import exceptions from glance_store import location from glance_store.tests import base -from tests.unit import test_store_capabilities +from glance_store.tests.unit import test_store_capabilities CONF = cfg.CONF diff --git a/tests/unit/test_swift_store_utils.py b/glance_store/tests/unit/test_swift_store_utils.py index 6651a74..6651a74 100644 --- a/tests/unit/test_swift_store_utils.py +++ b/glance_store/tests/unit/test_swift_store_utils.py diff --git a/tests/unit/test_utils.py b/glance_store/tests/unit/test_utils.py index e3a4042..e3a4042 100644 --- a/tests/unit/test_utils.py +++ b/glance_store/tests/unit/test_utils.py diff --git a/tests/unit/test_vmware_store.py b/glance_store/tests/unit/test_vmware_store.py index 40d96d5..dcd93ad 100644 --- a/tests/unit/test_vmware_store.py +++ b/glance_store/tests/unit/test_vmware_store.py @@ -31,8 +31,8 @@ from glance_store import backend from glance_store import exceptions from glance_store import location from glance_store.tests import base +from glance_store.tests.unit import test_store_capabilities from glance_store.tests import utils -from tests.unit import test_store_capabilities FAKE_UUID = str(uuid.uuid4()) diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/tests/unit/__init__.py +++ /dev/null |