Renamed test folder to tests

CloudVE · Mar 13, 2019 · c429294 · c429294
1 parent 5b36923
commit c429294
Show file tree

Hide file tree

Showing 24 changed files with 37 additions and 37 deletions.
diff --git a/codeclimate.yml b/codeclimate.yml
@@ -26,5 +26,5 @@ ratings:
   - "**.py"
   - "**.rb"
 exclude_paths:
-- test/**/*
+- tests/**/*
 - docs/**/*
diff --git a/docs/topics/testing.rst b/docs/topics/testing.rst
@@ -48,10 +48,10 @@ against a specific infrastructure, say aws, use a command like this:
 Specific test cases
 ~~~~~~~~~~~~~~~~~~~~
 You can run a specific test case, as follows:
-``tox -- test/test_image_service.py:CloudImageServiceTestCase.test_create_and_list_imag``
+``tox -- tests/test_image_service.py:CloudImageServiceTestCase.test_create_and_list_imag``
 
 It can also be restricted to a particular environment as follows:
-``tox -e "py27-aws" -- test/test_cloud_factory.py:CloudFactoryTestCase``
+``tox -e "py27-aws" -- tests/test_cloud_factory.py:CloudFactoryTestCase``
 
 See nosetest documentation for other parameters that can be passed in.
 
@@ -63,7 +63,7 @@ environment variable prior to running the tests, or they will default to
 ``CB_TEST_PROVIDER=aws``.
 
 You can also run a specific test case, as follows:
-``python setup.py test -s test.test_cloud_factory.CloudFactoryTestCase``
+``python setup.py test -s tests.test_cloud_factory.CloudFactoryTestCase``
 
 Using a mock provider
 ~~~~~~~~~~~~~~~~~~~~~

diff --git a/setup.cfg b/setup.cfg
@@ -20,4 +20,4 @@ logging-filter=cloudbridge
 universal = 1
 
 [flake8]
-application_import_names = cloudbridge, test
+application_import_names = cloudbridge, tests
diff --git a/setup.py b/setup.py
@@ -102,5 +102,5 @@
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: CPython'],
-    test_suite="test"
+    test_suite="tests"
 )
diff --git a/test/__init__.py → tests/__init__.py b/test/__init__.py → tests/__init__.py
diff --git a/test/fixtures/custom_amis.json → tests/fixtures/custom_amis.json b/test/fixtures/custom_amis.json → tests/fixtures/custom_amis.json
diff --git a/test/fixtures/logo.jpg → tests/fixtures/logo.jpg b/test/fixtures/logo.jpg → tests/fixtures/logo.jpg
diff --git a/test/helpers/__init__.py → tests/helpers/__init__.py b/test/helpers/__init__.py → tests/helpers/__init__.py
diff --git a/test/helpers/standard_interface_tests.py → tests/helpers/standard_interface_tests.py b/test/helpers/standard_interface_tests.py → tests/helpers/standard_interface_tests.py
@@ -18,7 +18,7 @@
 from cloudbridge.interfaces.resources import ResultList
 from cloudbridge.providers.aws.services import AWSImageService
 
-import test.helpers as helpers
+import tests.helpers as helpers
 
 
 def check_repr(test, obj):

diff --git a/test/test_base_helpers.py → tests/test_base_helpers.py b/test/test_base_helpers.py → tests/test_base_helpers.py
diff --git a/test/test_block_store_service.py → tests/test_block_store_service.py b/test/test_block_store_service.py → tests/test_block_store_service.py
@@ -11,9 +11,9 @@
 from cloudbridge.interfaces.resources import Snapshot
 from cloudbridge.interfaces.resources import Volume
 
-from test import helpers
-from test.helpers import ProviderTestBase
-from test.helpers import standard_interface_tests as sit
+from tests import helpers
+from tests.helpers import ProviderTestBase
+from tests.helpers import standard_interface_tests as sit
 
 
 class CloudBlockStoreServiceTestCase(ProviderTestBase):

diff --git a/test/test_cloud_factory.py → tests/test_cloud_factory.py b/test/test_cloud_factory.py → tests/test_cloud_factory.py
diff --git a/test/test_cloud_helpers.py → tests/test_cloud_helpers.py b/test/test_cloud_helpers.py → tests/test_cloud_helpers.py
@@ -6,7 +6,7 @@
 from cloudbridge.base.resources import ClientPagedResultList
 from cloudbridge.base.resources import ServerPagedResultList
 
-from test.helpers import ProviderTestBase
+from tests.helpers import ProviderTestBase
 
 
 class DummyResult(object):

diff --git a/test/test_compute_service.py → tests/test_compute_service.py b/test/test_compute_service.py → tests/test_compute_service.py
@@ -12,9 +12,9 @@
 from cloudbridge.interfaces.resources import SnapshotState
 from cloudbridge.interfaces.resources import VMType
 
-from test import helpers
-from test.helpers import ProviderTestBase
-from test.helpers import standard_interface_tests as sit
+from tests import helpers
+from tests.helpers import ProviderTestBase
+from tests.helpers import standard_interface_tests as sit
 
 
 class CloudComputeServiceTestCase(ProviderTestBase):

diff --git a/test/test_image_service.py → tests/test_image_service.py b/test/test_image_service.py → tests/test_image_service.py
@@ -3,9 +3,9 @@
 from cloudbridge.interfaces.resources import Instance
 from cloudbridge.interfaces.resources import MachineImage
 
-from test import helpers
-from test.helpers import ProviderTestBase
-from test.helpers import standard_interface_tests as sit
+from tests import helpers
+from tests.helpers import ProviderTestBase
+from tests.helpers import standard_interface_tests as sit
 
 
 class CloudImageServiceTestCase(ProviderTestBase):

diff --git a/test/test_interface.py → tests/test_interface.py b/test/test_interface.py → tests/test_interface.py
@@ -6,7 +6,7 @@
 from cloudbridge.interfaces import TestMockHelperMixin
 from cloudbridge.interfaces.exceptions import ProviderConnectionException
 
-from test.helpers import ProviderTestBase
+from tests.helpers import ProviderTestBase
 
 
 class CloudInterfaceTestCase(ProviderTestBase):

diff --git a/test/test_middleware_system.py → tests/test_middleware_system.py b/test/test_middleware_system.py → tests/test_middleware_system.py
diff --git a/test/test_network_service.py → tests/test_network_service.py b/test/test_network_service.py → tests/test_network_service.py
@@ -7,9 +7,9 @@
 from cloudbridge.interfaces.resources import Subnet
 from cloudbridge.interfaces.resources import SubnetState
 
-import test.helpers as helpers
-from test.helpers import ProviderTestBase
-from test.helpers import standard_interface_tests as sit
+import tests.helpers as helpers
+from tests.helpers import ProviderTestBase
+from tests.helpers import standard_interface_tests as sit
 
 
 class CloudNetworkServiceTestCase(ProviderTestBase):

diff --git a/test/test_object_life_cycle.py → tests/test_object_life_cycle.py b/test/test_object_life_cycle.py → tests/test_object_life_cycle.py
@@ -2,8 +2,8 @@
 from cloudbridge.interfaces import VolumeState
 from cloudbridge.interfaces.exceptions import WaitStateException
 
-from test import helpers
-from test.helpers import ProviderTestBase
+from tests import helpers
+from tests.helpers import ProviderTestBase
 
 
 class CloudObjectLifeCycleTestCase(ProviderTestBase):

diff --git a/test/test_object_store_service.py → tests/test_object_store_service.py b/test/test_object_store_service.py → tests/test_object_store_service.py
@@ -13,9 +13,9 @@
 from cloudbridge.interfaces.resources import Bucket
 from cloudbridge.interfaces.resources import BucketObject
 
-from test import helpers
-from test.helpers import ProviderTestBase
-from test.helpers import standard_interface_tests as sit
+from tests import helpers
+from tests.helpers import ProviderTestBase
+from tests.helpers import standard_interface_tests as sit
 
 
 class CloudObjectStoreServiceTestCase(ProviderTestBase):

diff --git a/test/test_region_service.py → tests/test_region_service.py b/test/test_region_service.py → tests/test_region_service.py
@@ -2,9 +2,9 @@
 
 from cloudbridge.interfaces import Region
 
-from test import helpers
-from test.helpers import ProviderTestBase
-from test.helpers import standard_interface_tests as sit
+from tests import helpers
+from tests.helpers import ProviderTestBase
+from tests.helpers import standard_interface_tests as sit
 
 
 class CloudRegionServiceTestCase(ProviderTestBase):

diff --git a/test/test_security_service.py → tests/test_security_service.py b/test/test_security_service.py → tests/test_security_service.py
@@ -6,9 +6,9 @@
 from cloudbridge.interfaces.resources import VMFirewall
 from cloudbridge.interfaces.resources import VMFirewallRule
 
-from test import helpers
-from test.helpers import ProviderTestBase
-from test.helpers import standard_interface_tests as sit
+from tests import helpers
+from tests.helpers import ProviderTestBase
+from tests.helpers import standard_interface_tests as sit
 
 
 class CloudSecurityServiceTestCase(ProviderTestBase):

diff --git a/test/test_vm_types_service.py → tests/test_vm_types_service.py b/test/test_vm_types_service.py → tests/test_vm_types_service.py
@@ -1,8 +1,8 @@
 import six
 
-from test import helpers
-from test.helpers import ProviderTestBase
-from test.helpers import standard_interface_tests as sit
+from tests import helpers
+from tests.helpers import ProviderTestBase
+from tests.helpers import standard_interface_tests as sit
 
 
 class CloudVMTypeServiceTestCase(ProviderTestBase):

diff --git a/tox.ini b/tox.ini
@@ -9,11 +9,11 @@
 envlist = {py27,py36,pypy}-{aws,azure,gcp,openstack,mock}
 
 [testenv]
-commands = flake8 cloudbridge test setup.py
+commands = flake8 cloudbridge tests setup.py
            # see setup.cfg for options sent to nosetests and coverage
            nosetests -v --nocapture --nologcapture --logging-format='%(asctime)s [%(levelname)s] %(name)s: %(message)s' {posargs}
 setenv =
-    MOTO_AMIS_PATH=./test/fixtures/custom_amis.json
+    MOTO_AMIS_PATH=./tests/fixtures/custom_amis.json
     # Fix for moto import issue: https://github.com/travis-ci/travis-ci/issues/7940
     BOTO_CONFIG=/dev/null
     aws: CB_TEST_PROVIDER=aws