From 0ae8f4102e7aeebb75fe5f65c02ed9bfa76cebb5 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sat, 18 Apr 2015 23:59:04 +0100
Subject: [PATCH] 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
---
 .testr.conf                                                   | 2 +-
 {tests => glance_store/tests/unit}/__init__.py                | 0
 {tests => glance_store/tests}/unit/test_cinder_store.py       | 2 +-
 {tests => glance_store/tests}/unit/test_filesystem_store.py   | 2 +-
 {tests => glance_store/tests}/unit/test_gridfs_store.py       | 2 +-
 {tests => glance_store/tests}/unit/test_http_store.py         | 2 +-
 {tests => glance_store/tests}/unit/test_opts.py               | 0
 {tests => glance_store/tests}/unit/test_rbd_store.py          | 2 +-
 {tests => glance_store/tests}/unit/test_s3_store.py           | 2 +-
 {tests => glance_store/tests}/unit/test_sheepdog_store.py     | 2 +-
 {tests => glance_store/tests}/unit/test_store_base.py         | 0
 {tests => glance_store/tests}/unit/test_store_capabilities.py | 0
 {tests => glance_store/tests}/unit/test_swift_store.py        | 2 +-
 {tests => glance_store/tests}/unit/test_swift_store_utils.py  | 0
 {tests => glance_store/tests}/unit/test_utils.py              | 0
 {tests => glance_store/tests}/unit/test_vmware_store.py       | 2 +-
 tests/unit/__init__.py                                        | 0
 17 files changed, 10 insertions(+), 10 deletions(-)
 rename {tests => glance_store/tests/unit}/__init__.py (100%)
 rename {tests => glance_store/tests}/unit/test_cinder_store.py (98%)
 rename {tests => glance_store/tests}/unit/test_filesystem_store.py (99%)
 rename {tests => glance_store/tests}/unit/test_gridfs_store.py (97%)
 rename {tests => glance_store/tests}/unit/test_http_store.py (99%)
 rename {tests => glance_store/tests}/unit/test_opts.py (100%)
 rename {tests => glance_store/tests}/unit/test_rbd_store.py (99%)
 rename {tests => glance_store/tests}/unit/test_s3_store.py (99%)
 rename {tests => glance_store/tests}/unit/test_sheepdog_store.py (97%)
 rename {tests => glance_store/tests}/unit/test_store_base.py (100%)
 rename {tests => glance_store/tests}/unit/test_store_capabilities.py (100%)
 rename {tests => glance_store/tests}/unit/test_swift_store.py (99%)
 rename {tests => glance_store/tests}/unit/test_swift_store_utils.py (100%)
 rename {tests => glance_store/tests}/unit/test_utils.py (100%)
 rename {tests => glance_store/tests}/unit/test_vmware_store.py (99%)
 delete mode 100644 tests/unit/__init__.py

diff --git a/.testr.conf b/.testr.conf
index d3026e87..c3535efd 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
similarity index 100%
rename from tests/__init__.py
rename to glance_store/tests/unit/__init__.py
diff --git a/tests/unit/test_cinder_store.py b/glance_store/tests/unit/test_cinder_store.py
similarity index 98%
rename from tests/unit/test_cinder_store.py
rename to glance_store/tests/unit/test_cinder_store.py
index c2b5c157..069c716d 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
similarity index 99%
rename from tests/unit/test_filesystem_store.py
rename to glance_store/tests/unit/test_filesystem_store.py
index 870b4e3c..f5ef3dbf 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
similarity index 97%
rename from tests/unit/test_gridfs_store.py
rename to glance_store/tests/unit/test_gridfs_store.py
index c39c5f5e..066b0b88 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
similarity index 99%
rename from tests/unit/test_http_store.py
rename to glance_store/tests/unit/test_http_store.py
index 1cbe8c9d..6ab4db62 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
similarity index 100%
rename from tests/unit/test_opts.py
rename to 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
similarity index 99%
rename from tests/unit/test_rbd_store.py
rename to glance_store/tests/unit/test_rbd_store.py
index 6bda8985..272f4637 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
similarity index 99%
rename from tests/unit/test_s3_store.py
rename to glance_store/tests/unit/test_s3_store.py
index 5d585730..a15fcf07 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
similarity index 97%
rename from tests/unit/test_sheepdog_store.py
rename to glance_store/tests/unit/test_sheepdog_store.py
index a849fd52..39f8e054 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
similarity index 100%
rename from tests/unit/test_store_base.py
rename to 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
similarity index 100%
rename from tests/unit/test_store_capabilities.py
rename to 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
similarity index 99%
rename from tests/unit/test_swift_store.py
rename to glance_store/tests/unit/test_swift_store.py
index bdfc8aab..d4547c82 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
similarity index 100%
rename from tests/unit/test_swift_store_utils.py
rename to 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
similarity index 100%
rename from tests/unit/test_utils.py
rename to 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
similarity index 99%
rename from tests/unit/test_vmware_store.py
rename to glance_store/tests/unit/test_vmware_store.py
index 40d96d50..dcd93adb 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 e69de29b..00000000