Move tests under the glance namespace.

athanatos · Aug 2, 2011 · 327f752 · 327f752
1 parent 99b8a56
commit 327f752
Show file tree

Hide file tree

Showing 31 changed files with 21 additions and 24 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,9 +1,6 @@
 include run_tests.sh ChangeLog
 include README builddeb.sh
 include MANIFEST.in pylintrc
-include tests/__init__.py
-include tests/stubs.py
-include tests/utils.py
 include run_tests.py
 include glance/registry/db/migrate_repo/migrate.cfg
 include glance/registry/db/migrate_repo/versions/*.sql

diff --git a/tests/__init__.py → glance/tests/__init__.py b/tests/__init__.py → glance/tests/__init__.py
diff --git a/tests/functional/__init__.py → glance/tests/functional/__init__.py b/tests/functional/__init__.py → glance/tests/functional/__init__.py
@@ -35,7 +35,7 @@
 import unittest
 import urlparse
 
-from tests.utils import execute, get_unused_port
+from glance.tests.utils import execute, get_unused_port
 
 from sqlalchemy import create_engine
 

diff --git a/tests/functional/test_bin_glance.py → glance/tests/functional/test_bin_glance.py b/tests/functional/test_bin_glance.py → glance/tests/functional/test_bin_glance.py
@@ -21,8 +21,8 @@
 import tempfile
 import unittest
 
-from tests import functional
-from tests.utils import execute
+from glance.tests import functional
+from glance.tests.utils import execute
 
 
 class TestBinGlance(functional.FunctionalTest):

diff --git a/tests/functional/test_curl_api.py → glance/tests/functional/test_curl_api.py b/tests/functional/test_curl_api.py → glance/tests/functional/test_curl_api.py
@@ -22,8 +22,8 @@
 import tempfile
 import unittest
 
-from tests import functional
-from tests.utils import execute
+from glance.tests import functional
+from glance.tests.utils import execute
 
 FIVE_KB = 5 * 1024
 FIVE_GB = 5 * 1024 * 1024 * 1024

diff --git a/tests/functional/test_httplib2_api.py → glance/tests/functional/test_httplib2_api.py b/tests/functional/test_httplib2_api.py → glance/tests/functional/test_httplib2_api.py
@@ -23,8 +23,8 @@
 import os
 import tempfile
 
-from tests import functional
-from tests.utils import execute
+from glance.tests import functional
+from glance.tests.utils import execute
 
 FIVE_KB = 5 * 1024
 FIVE_GB = 5 * 1024 * 1024 * 1024

diff --git a/tests/functional/test_logging.py → glance/tests/functional/test_logging.py b/tests/functional/test_logging.py → glance/tests/functional/test_logging.py
@@ -20,8 +20,8 @@
 import os
 import unittest
 
-from tests import functional
-from tests.utils import execute
+from glance.tests import functional
+from glance.tests.utils import execute
 
 
 class TestLogging(functional.FunctionalTest):

diff --git a/tests/functional/test_misc.py → glance/tests/functional/test_misc.py b/tests/functional/test_misc.py → glance/tests/functional/test_misc.py
@@ -17,8 +17,8 @@
 
 import unittest
 
-from tests import functional
-from tests.utils import execute
+from glance.tests import functional
+from glance.tests.utils import execute
 
 
 class TestMiscellaneous(functional.FunctionalTest):

diff --git a/tests/functional/test_s3.conf → glance/tests/functional/test_s3.conf b/tests/functional/test_s3.conf → glance/tests/functional/test_s3.conf
diff --git a/tests/functional/test_s3.py → glance/tests/functional/test_s3.py b/tests/functional/test_s3.py → glance/tests/functional/test_s3.py
@@ -36,8 +36,8 @@
 import tempfile
 import unittest
 
-from tests import functional
-from tests.utils import execute
+from glance.tests import functional
+from glance.tests.utils import execute
 
 FIVE_KB = 5 * 1024
 FIVE_GB = 5 * 1024 * 1024 * 1024

diff --git a/tests/functional/test_scrubber.py → glance/tests/functional/test_scrubber.py b/tests/functional/test_scrubber.py → glance/tests/functional/test_scrubber.py
@@ -21,8 +21,8 @@
 
 from sqlalchemy import create_engine
 
-from tests import functional
-from tests.utils import execute
+from glance.tests import functional
+from glance.tests.utils import execute
 
 from glance import client
 

diff --git a/tests/stubs.py → glance/tests/stubs.py b/tests/stubs.py → glance/tests/stubs.py
diff --git a/tests/unit/__init__.py → glance/tests/unit/__init__.py b/tests/unit/__init__.py → glance/tests/unit/__init__.py
diff --git a/tests/unit/test_api.py → glance/tests/unit/test_api.py b/tests/unit/test_api.py → glance/tests/unit/test_api.py
@@ -29,7 +29,7 @@
 from glance.common import context
 from glance.registry import server as rserver
 import glance.registry.db.api
-from tests import stubs
+from glance.tests import stubs
 
 VERBOSE = False
 DEBUG = False

diff --git a/tests/unit/test_clients.py → glance/tests/unit/test_clients.py b/tests/unit/test_clients.py → glance/tests/unit/test_clients.py
@@ -28,7 +28,7 @@
 from glance.common import exception
 import glance.registry.db.api
 from glance.registry import client as rclient
-from tests import stubs
+from glance.tests import stubs
 
 
 class TestBadClients(unittest.TestCase):

diff --git a/tests/unit/test_config.py → glance/tests/unit/test_config.py b/tests/unit/test_config.py → glance/tests/unit/test_config.py
diff --git a/tests/unit/test_context.py → glance/tests/unit/test_context.py b/tests/unit/test_context.py → glance/tests/unit/test_context.py
diff --git a/tests/unit/test_filesystem_store.py → glance/tests/unit/test_filesystem_store.py b/tests/unit/test_filesystem_store.py → glance/tests/unit/test_filesystem_store.py
@@ -26,7 +26,7 @@
 from glance.common import exception
 from glance.store.location import get_location_from_uri
 from glance.store.filesystem import Store, ChunkedFile
-from tests import stubs
+from glance.tests import stubs
 
 FILESYSTEM_OPTIONS = {
     'verbose': True,

diff --git a/tests/unit/test_http_store.py → glance/tests/unit/test_http_store.py b/tests/unit/test_http_store.py → glance/tests/unit/test_http_store.py
diff --git a/tests/unit/test_migrations.conf → glance/tests/unit/test_migrations.conf b/tests/unit/test_migrations.conf → glance/tests/unit/test_migrations.conf
diff --git a/tests/unit/test_migrations.py → glance/tests/unit/test_migrations.py b/tests/unit/test_migrations.py → glance/tests/unit/test_migrations.py
@@ -36,7 +36,7 @@
 
 from glance.common import exception
 import glance.registry.db.migration as migration_api
-from tests.utils import execute
+from glance.tests.utils import execute
 
 
 class TestMigrations(unittest.TestCase):

diff --git a/tests/unit/test_misc.py → glance/tests/unit/test_misc.py b/tests/unit/test_misc.py → glance/tests/unit/test_misc.py
diff --git a/tests/unit/test_s3_store.py → glance/tests/unit/test_s3_store.py b/tests/unit/test_s3_store.py → glance/tests/unit/test_s3_store.py
diff --git a/tests/unit/test_store_location.py → glance/tests/unit/test_store_location.py b/tests/unit/test_store_location.py → glance/tests/unit/test_store_location.py
diff --git a/tests/unit/test_swift_store.py → glance/tests/unit/test_swift_store.py b/tests/unit/test_swift_store.py → glance/tests/unit/test_swift_store.py
diff --git a/tests/unit/test_utils.py → glance/tests/unit/test_utils.py b/tests/unit/test_utils.py → glance/tests/unit/test_utils.py
diff --git a/tests/unit/test_versions.py → glance/tests/unit/test_versions.py b/tests/unit/test_versions.py → glance/tests/unit/test_versions.py
diff --git a/tests/unit/test_wsgi.py → glance/tests/unit/test_wsgi.py b/tests/unit/test_wsgi.py → glance/tests/unit/test_wsgi.py
diff --git a/tests/utils.py → glance/tests/utils.py b/tests/utils.py → glance/tests/utils.py
diff --git a/run_tests.sh b/run_tests.sh
@@ -58,7 +58,7 @@ function run_pep8 {
   #
   PEP8_EXCLUDE=vcsversion.py
   PEP8_OPTIONS="--exclude=$PEP8_EXCLUDE --repeat --show-pep8 --show-source"
-  PEP8_INCLUDE="bin/* glance tests tools setup.py run_tests.py"
+  PEP8_INCLUDE="bin/* glance tools setup.py run_tests.py"
   pep8 $PEP8_OPTIONS $PEP8_INCLUDE
 }
 

diff --git a/setup.py b/setup.py
@@ -74,7 +74,7 @@ def run(self):
     author='OpenStack',
     author_email='[email protected]',
     url='http://glance.openstack.org/',
-    packages=find_packages(exclude=['tests', 'bin']),
+    packages=find_packages(exclude=['bin']),
     test_suite='nose.collector',
     cmdclass=cmdclass,
     include_package_data=True,