From 327f7525c067722a5e822e421120cdf283418e06 Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Wed, 3 Aug 2011 00:10:52 +0200 Subject: [PATCH] Move tests under the glance namespace. --- MANIFEST.in | 3 --- {tests => glance/tests}/__init__.py | 0 {tests => glance/tests}/functional/__init__.py | 2 +- {tests => glance/tests}/functional/test_bin_glance.py | 4 ++-- {tests => glance/tests}/functional/test_curl_api.py | 4 ++-- {tests => glance/tests}/functional/test_httplib2_api.py | 4 ++-- {tests => glance/tests}/functional/test_logging.py | 4 ++-- {tests => glance/tests}/functional/test_misc.py | 4 ++-- {tests => glance/tests}/functional/test_s3.conf | 0 {tests => glance/tests}/functional/test_s3.py | 4 ++-- {tests => glance/tests}/functional/test_scrubber.py | 4 ++-- {tests => glance/tests}/stubs.py | 0 {tests => glance/tests}/unit/__init__.py | 0 {tests => glance/tests}/unit/test_api.py | 2 +- {tests => glance/tests}/unit/test_clients.py | 2 +- {tests => glance/tests}/unit/test_config.py | 0 {tests => glance/tests}/unit/test_context.py | 0 {tests => glance/tests}/unit/test_filesystem_store.py | 2 +- {tests => glance/tests}/unit/test_http_store.py | 0 {tests => glance/tests}/unit/test_migrations.conf | 0 {tests => glance/tests}/unit/test_migrations.py | 2 +- {tests => glance/tests}/unit/test_misc.py | 0 {tests => glance/tests}/unit/test_s3_store.py | 0 {tests => glance/tests}/unit/test_store_location.py | 0 {tests => glance/tests}/unit/test_swift_store.py | 0 {tests => glance/tests}/unit/test_utils.py | 0 {tests => glance/tests}/unit/test_versions.py | 0 {tests => glance/tests}/unit/test_wsgi.py | 0 {tests => glance/tests}/utils.py | 0 run_tests.sh | 2 +- setup.py | 2 +- 31 files changed, 21 insertions(+), 24 deletions(-) rename {tests => glance/tests}/__init__.py (100%) rename {tests => glance/tests}/functional/__init__.py (99%) rename {tests => glance/tests}/functional/test_bin_glance.py (99%) rename {tests => glance/tests}/functional/test_curl_api.py (99%) rename {tests => glance/tests}/functional/test_httplib2_api.py (99%) rename {tests => glance/tests}/functional/test_logging.py (96%) rename {tests => glance/tests}/functional/test_misc.py (96%) rename {tests => glance/tests}/functional/test_s3.conf (100%) rename {tests => glance/tests}/functional/test_s3.py (99%) rename {tests => glance/tests}/functional/test_scrubber.py (98%) rename {tests => glance/tests}/stubs.py (100%) rename {tests => glance/tests}/unit/__init__.py (100%) rename {tests => glance/tests}/unit/test_api.py (99%) rename {tests => glance/tests}/unit/test_clients.py (99%) rename {tests => glance/tests}/unit/test_config.py (100%) rename {tests => glance/tests}/unit/test_context.py (100%) rename {tests => glance/tests}/unit/test_filesystem_store.py (99%) rename {tests => glance/tests}/unit/test_http_store.py (100%) rename {tests => glance/tests}/unit/test_migrations.conf (100%) rename {tests => glance/tests}/unit/test_migrations.py (99%) rename {tests => glance/tests}/unit/test_misc.py (100%) rename {tests => glance/tests}/unit/test_s3_store.py (100%) rename {tests => glance/tests}/unit/test_store_location.py (100%) rename {tests => glance/tests}/unit/test_swift_store.py (100%) rename {tests => glance/tests}/unit/test_utils.py (100%) rename {tests => glance/tests}/unit/test_versions.py (100%) rename {tests => glance/tests}/unit/test_wsgi.py (100%) rename {tests => glance/tests}/utils.py (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 57b4e826cb..04821731ce 100644 --- 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 b/glance/tests/__init__.py similarity index 100% rename from tests/__init__.py rename to glance/tests/__init__.py diff --git a/tests/functional/__init__.py b/glance/tests/functional/__init__.py similarity index 99% rename from tests/functional/__init__.py rename to glance/tests/functional/__init__.py index f717d3840c..34645a41af 100644 --- a/tests/functional/__init__.py +++ b/glance/tests/functional/__init__.py @@ -35,7 +35,7 @@ import time 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 b/glance/tests/functional/test_bin_glance.py similarity index 99% rename from tests/functional/test_bin_glance.py rename to glance/tests/functional/test_bin_glance.py index acaed8fd7c..922522f1e1 100644 --- a/tests/functional/test_bin_glance.py +++ b/glance/tests/functional/test_bin_glance.py @@ -21,8 +21,8 @@ import os 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 b/glance/tests/functional/test_curl_api.py similarity index 99% rename from tests/functional/test_curl_api.py rename to glance/tests/functional/test_curl_api.py index 924754376d..8af9fefbc0 100644 --- a/tests/functional/test_curl_api.py +++ b/glance/tests/functional/test_curl_api.py @@ -22,8 +22,8 @@ import os 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 b/glance/tests/functional/test_httplib2_api.py similarity index 99% rename from tests/functional/test_httplib2_api.py rename to glance/tests/functional/test_httplib2_api.py index d74556a00e..cab92f8fc0 100644 --- a/tests/functional/test_httplib2_api.py +++ b/glance/tests/functional/test_httplib2_api.py @@ -23,8 +23,8 @@ import json 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 b/glance/tests/functional/test_logging.py similarity index 96% rename from tests/functional/test_logging.py rename to glance/tests/functional/test_logging.py index 4f5287ad11..8198fa926c 100644 --- a/tests/functional/test_logging.py +++ b/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 b/glance/tests/functional/test_misc.py similarity index 96% rename from tests/functional/test_misc.py rename to glance/tests/functional/test_misc.py index afb96e50f0..a969083733 100644 --- a/tests/functional/test_misc.py +++ b/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 b/glance/tests/functional/test_s3.conf similarity index 100% rename from tests/functional/test_s3.conf rename to glance/tests/functional/test_s3.conf diff --git a/tests/functional/test_s3.py b/glance/tests/functional/test_s3.py similarity index 99% rename from tests/functional/test_s3.py rename to glance/tests/functional/test_s3.py index 3868706284..d8227b3716 100644 --- a/tests/functional/test_s3.py +++ b/glance/tests/functional/test_s3.py @@ -36,8 +36,8 @@ import os 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 b/glance/tests/functional/test_scrubber.py similarity index 98% rename from tests/functional/test_scrubber.py rename to glance/tests/functional/test_scrubber.py index 21df0f6308..3d678b2e9c 100644 --- a/tests/functional/test_scrubber.py +++ b/glance/tests/functional/test_scrubber.py @@ -21,8 +21,8 @@ import unittest 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 b/glance/tests/stubs.py similarity index 100% rename from tests/stubs.py rename to glance/tests/stubs.py diff --git a/tests/unit/__init__.py b/glance/tests/unit/__init__.py similarity index 100% rename from tests/unit/__init__.py rename to glance/tests/unit/__init__.py diff --git a/tests/unit/test_api.py b/glance/tests/unit/test_api.py similarity index 99% rename from tests/unit/test_api.py rename to glance/tests/unit/test_api.py index f254d194d6..92dad3ba66 100644 --- a/tests/unit/test_api.py +++ b/glance/tests/unit/test_api.py @@ -29,7 +29,7 @@ from glance.api import v1 as server 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 b/glance/tests/unit/test_clients.py similarity index 99% rename from tests/unit/test_clients.py rename to glance/tests/unit/test_clients.py index e8e78ad773..f84ff5b427 100644 --- a/tests/unit/test_clients.py +++ b/glance/tests/unit/test_clients.py @@ -28,7 +28,7 @@ from glance import client 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 b/glance/tests/unit/test_config.py similarity index 100% rename from tests/unit/test_config.py rename to glance/tests/unit/test_config.py diff --git a/tests/unit/test_context.py b/glance/tests/unit/test_context.py similarity index 100% rename from tests/unit/test_context.py rename to glance/tests/unit/test_context.py diff --git a/tests/unit/test_filesystem_store.py b/glance/tests/unit/test_filesystem_store.py similarity index 99% rename from tests/unit/test_filesystem_store.py rename to glance/tests/unit/test_filesystem_store.py index 5dc704b3ca..d7ce4d830f 100644 --- a/tests/unit/test_filesystem_store.py +++ b/glance/tests/unit/test_filesystem_store.py @@ -26,7 +26,7 @@ import stubout 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 b/glance/tests/unit/test_http_store.py similarity index 100% rename from tests/unit/test_http_store.py rename to glance/tests/unit/test_http_store.py diff --git a/tests/unit/test_migrations.conf b/glance/tests/unit/test_migrations.conf similarity index 100% rename from tests/unit/test_migrations.conf rename to glance/tests/unit/test_migrations.conf diff --git a/tests/unit/test_migrations.py b/glance/tests/unit/test_migrations.py similarity index 99% rename from tests/unit/test_migrations.py rename to glance/tests/unit/test_migrations.py index c5a9d55c6d..bdd5c936e5 100644 --- a/tests/unit/test_migrations.py +++ b/glance/tests/unit/test_migrations.py @@ -36,7 +36,7 @@ from sqlalchemy.pool import NullPool 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 b/glance/tests/unit/test_misc.py similarity index 100% rename from tests/unit/test_misc.py rename to glance/tests/unit/test_misc.py diff --git a/tests/unit/test_s3_store.py b/glance/tests/unit/test_s3_store.py similarity index 100% rename from tests/unit/test_s3_store.py rename to glance/tests/unit/test_s3_store.py diff --git a/tests/unit/test_store_location.py b/glance/tests/unit/test_store_location.py similarity index 100% rename from tests/unit/test_store_location.py rename to glance/tests/unit/test_store_location.py diff --git a/tests/unit/test_swift_store.py b/glance/tests/unit/test_swift_store.py similarity index 100% rename from tests/unit/test_swift_store.py rename to glance/tests/unit/test_swift_store.py diff --git a/tests/unit/test_utils.py b/glance/tests/unit/test_utils.py similarity index 100% rename from tests/unit/test_utils.py rename to glance/tests/unit/test_utils.py diff --git a/tests/unit/test_versions.py b/glance/tests/unit/test_versions.py similarity index 100% rename from tests/unit/test_versions.py rename to glance/tests/unit/test_versions.py diff --git a/tests/unit/test_wsgi.py b/glance/tests/unit/test_wsgi.py similarity index 100% rename from tests/unit/test_wsgi.py rename to glance/tests/unit/test_wsgi.py diff --git a/tests/utils.py b/glance/tests/utils.py similarity index 100% rename from tests/utils.py rename to glance/tests/utils.py diff --git a/run_tests.sh b/run_tests.sh index 0bc6d71972..99e1005d52 100755 --- 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 index 11d434d68b..e56b56c89f 100644 --- a/setup.py +++ b/setup.py @@ -74,7 +74,7 @@ setup( author='OpenStack', author_email='openstack@lists.launchpad.net', 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,