Skip to content
Browse files

Move tests into the novaclient package.

tests/__init__.py implies a package in the global namespace. These
tests are not global python tests, but rather tests for novaclient.

Change-Id: Ifeb8082aa010d15dddc9ae02e35589bc78ad48cc
  • Loading branch information...
1 parent 51f0596 commit c34c371e963f04f44339c07dfcd40b7814e3217f @emonty emonty committed May 18, 2013
Showing with 78 additions and 78 deletions.
  1. +1 −1 .testr.conf
  2. 0 {tests/v1_1/contrib → novaclient/tests}/__init__.py
  3. 0 { → novaclient}/tests/fakes.py
  4. +1 −1 { → novaclient}/tests/test_auth_plugins.py
  5. +2 −2 { → novaclient}/tests/test_base.py
  6. +1 −1 { → novaclient}/tests/test_client.py
  7. +1 −1 { → novaclient}/tests/test_discover.py
  8. +1 −1 { → novaclient}/tests/test_http.py
  9. +1 −1 { → novaclient}/tests/test_service_catalog.py
  10. +1 −1 { → novaclient}/tests/test_shell.py
  11. +1 −1 { → novaclient}/tests/test_utils.py
  12. 0 { → novaclient}/tests/utils.py
  13. 0 { → novaclient}/tests/v1_1/__init__.py
  14. 0 {tests → novaclient/tests/v1_1/contrib}/__init__.py
  15. +1 −1 { → novaclient}/tests/v1_1/contrib/fakes.py
  16. +2 −2 { → novaclient}/tests/v1_1/contrib/test_baremetal.py
  17. +2 −2 { → novaclient}/tests/v1_1/contrib/test_instance_actions.py
  18. +2 −2 { → novaclient}/tests/v1_1/contrib/test_list_extensions.py
  19. +2 −2 { → novaclient}/tests/v1_1/contrib/test_tenant_networks.py
  20. +2 −2 { → novaclient}/tests/v1_1/fakes.py
  21. +2 −2 { → novaclient}/tests/v1_1/test_agents.py
  22. +2 −2 { → novaclient}/tests/v1_1/test_aggregates.py
  23. +1 −1 { → novaclient}/tests/v1_1/test_auth.py
  24. +2 −2 { → novaclient}/tests/v1_1/test_availability_zone.py
  25. +2 −2 { → novaclient}/tests/v1_1/test_certs.py
  26. +2 −2 { → novaclient}/tests/v1_1/test_cloudpipe.py
  27. +2 −2 { → novaclient}/tests/v1_1/test_coverage_ext.py
  28. +2 −2 { → novaclient}/tests/v1_1/test_fixed_ips.py
  29. +2 −2 { → novaclient}/tests/v1_1/test_flavor_access.py
  30. +2 −2 { → novaclient}/tests/v1_1/test_flavors.py
  31. +2 −2 { → novaclient}/tests/v1_1/test_floating_ip_dns.py
  32. +2 −2 { → novaclient}/tests/v1_1/test_floating_ip_pools.py
  33. +2 −2 { → novaclient}/tests/v1_1/test_floating_ips.py
  34. +2 −2 { → novaclient}/tests/v1_1/test_floating_ips_bulk.py
  35. +2 −2 { → novaclient}/tests/v1_1/test_fping.py
  36. +2 −2 { → novaclient}/tests/v1_1/test_hosts.py
  37. +2 −2 { → novaclient}/tests/v1_1/test_hypervisors.py
  38. +2 −2 { → novaclient}/tests/v1_1/test_images.py
  39. +2 −2 { → novaclient}/tests/v1_1/test_keypairs.py
  40. +2 −2 { → novaclient}/tests/v1_1/test_limits.py
  41. +2 −2 { → novaclient}/tests/v1_1/test_networks.py
  42. +2 −2 { → novaclient}/tests/v1_1/test_quota_classes.py
  43. +2 −2 { → novaclient}/tests/v1_1/test_quotas.py
  44. +2 −2 { → novaclient}/tests/v1_1/test_security_group_rules.py
  45. +2 −2 { → novaclient}/tests/v1_1/test_security_groups.py
  46. +2 −2 { → novaclient}/tests/v1_1/test_servers.py
  47. +2 −2 { → novaclient}/tests/v1_1/test_services.py
  48. +2 −2 { → novaclient}/tests/v1_1/test_shell.py
  49. +2 −2 { → novaclient}/tests/v1_1/test_usage.py
  50. 0 { → novaclient}/tests/v1_1/testfile.txt
  51. 0 { → novaclient}/tests/v1_1/utils.py
View
2 .testr.conf
@@ -1,4 +1,4 @@
[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} ${PYTHON:-python} -m subunit.run discover -t ./ ./ $LISTOPT $IDOPTION
test_id_option=--load-list $IDFILE
test_list_option=--list
View
0 tests/v1_1/contrib/__init__.py → novaclient/tests/__init__.py
File renamed without changes.
View
0 tests/fakes.py → novaclient/tests/fakes.py
File renamed without changes.
View
2 tests/test_auth_plugins.py → novaclient/tests/test_auth_plugins.py
@@ -26,7 +26,7 @@
from novaclient import auth_plugin
from novaclient import exceptions
from novaclient.v1_1 import client
-from tests import utils
+from novaclient.tests import utils
def mock_http_request(resp=None):
View
4 tests/test_base.py → novaclient/tests/test_base.py
@@ -1,8 +1,8 @@
from novaclient import base
from novaclient import exceptions
from novaclient.v1_1 import flavors
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
2 tests/test_client.py → novaclient/tests/test_client.py
@@ -19,7 +19,7 @@
import novaclient.client
import novaclient.v1_1.client
-from tests import utils
+from novaclient.tests import utils
class ClientTest(utils.TestCase):
View
2 tests/test_discover.py → novaclient/tests/test_discover.py
@@ -19,7 +19,7 @@
import pkg_resources
import novaclient.shell
-from tests import utils
+from novaclient.tests import utils
class DiscoverTest(utils.TestCase):
View
2 tests/test_http.py → novaclient/tests/test_http.py
@@ -3,7 +3,7 @@
from novaclient import client
from novaclient import exceptions
-from tests import utils
+from novaclient.tests import utils
fake_response = utils.TestResponse({
View
2 tests/test_service_catalog.py → novaclient/tests/test_service_catalog.py
@@ -1,6 +1,6 @@
from novaclient import exceptions
from novaclient import service_catalog
-from tests import utils
+from novaclient.tests import utils
# Taken directly from keystone/content/common/samples/auth.json
View
2 tests/test_shell.py → novaclient/tests/test_shell.py
@@ -9,7 +9,7 @@
import novaclient.client
from novaclient import exceptions
import novaclient.shell
-from tests import utils
+from novaclient.tests import utils
FAKE_ENV = {'OS_USERNAME': 'username',
'OS_PASSWORD': 'password',
View
2 tests/test_utils.py → novaclient/tests/test_utils.py
@@ -6,7 +6,7 @@
from novaclient import exceptions
from novaclient import utils
from novaclient import base
-from tests import utils as test_utils
+from novaclient.tests import utils as test_utils
UUID = '8e8ec658-c7b0-4243-bdf8-6f7f2952c0d0'
View
0 tests/utils.py → novaclient/tests/utils.py
File renamed without changes.
View
0 tests/v1_1/__init__.py → novaclient/tests/v1_1/__init__.py
File renamed without changes.
View
0 tests/__init__.py → novaclient/tests/v1_1/contrib/__init__.py
File renamed without changes.
View
2 tests/v1_1/contrib/fakes.py → novaclient/tests/v1_1/contrib/fakes.py
@@ -13,7 +13,7 @@
# limitations under the License.
from novaclient.v1_1 import client
-from tests.v1_1 import fakes
+from novaclient.tests.v1_1 import fakes
class FakeClient(fakes.FakeClient):
View
4 tests/v1_1/contrib/test_baremetal.py → ...ient/tests/v1_1/contrib/test_baremetal.py
@@ -17,8 +17,8 @@
from novaclient import extension
from novaclient.v1_1.contrib import baremetal
-from tests import utils
-from tests.v1_1.contrib import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1.contrib import fakes
extensions = [
View
4 tests/v1_1/contrib/test_instance_actions.py → ...sts/v1_1/contrib/test_instance_actions.py
@@ -15,8 +15,8 @@
from novaclient import extension
from novaclient.v1_1.contrib import instance_action
-from tests import utils
-from tests.v1_1.contrib import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1.contrib import fakes
extensions = [
View
4 tests/v1_1/contrib/test_list_extensions.py → ...ests/v1_1/contrib/test_list_extensions.py
@@ -1,8 +1,8 @@
from novaclient import extension
from novaclient.v1_1.contrib import list_extensions
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
extensions = [
View
4 tests/v1_1/contrib/test_tenant_networks.py → ...ests/v1_1/contrib/test_tenant_networks.py
@@ -18,8 +18,8 @@
from novaclient import extension
from novaclient.v1_1.contrib import tenant_networks
-from tests import utils
-from tests.v1_1.contrib import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1.contrib import fakes
extensions = [
View
4 tests/v1_1/fakes.py → novaclient/tests/v1_1/fakes.py
@@ -19,8 +19,8 @@
from novaclient import client as base_client
from novaclient.v1_1 import client
-from tests import fakes
-from tests import utils
+from novaclient.tests import fakes
+from novaclient.tests import utils
class FakeClient(fakes.FakeClient, client.Client):
View
4 tests/v1_1/test_agents.py → novaclient/tests/v1_1/test_agents.py
@@ -16,8 +16,8 @@
# under the License.
from novaclient.v1_1 import agents
-from tests.v1_1 import fakes
-from tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.tests import utils
cs = fakes.FakeClient()
View
4 tests/v1_1/test_aggregates.py → novaclient/tests/v1_1/test_aggregates.py
@@ -14,8 +14,8 @@
# under the License.
from novaclient.v1_1 import aggregates
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
2 tests/v1_1/test_auth.py → novaclient/tests/v1_1/test_auth.py
@@ -6,7 +6,7 @@
from novaclient.v1_1 import client
from novaclient import exceptions
-from tests import utils
+from novaclient.tests import utils
class AuthenticateAgainstKeystoneTests(utils.TestCase):
View
4 tests/v1_1/test_availability_zone.py → ...ient/tests/v1_1/test_availability_zone.py
@@ -16,8 +16,8 @@
from novaclient.v1_1 import availability_zones
from novaclient.v1_1 import shell
-from tests.v1_1 import fakes
-from tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.tests import utils
cs = fakes.FakeClient()
View
4 tests/v1_1/test_certs.py → novaclient/tests/v1_1/test_certs.py
@@ -1,6 +1,6 @@
from novaclient.v1_1 import certs
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_cloudpipe.py → novaclient/tests/v1_1/test_cloudpipe.py
@@ -1,6 +1,6 @@
from novaclient.v1_1 import cloudpipe
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_coverage_ext.py → novaclient/tests/v1_1/test_coverage_ext.py
@@ -17,8 +17,8 @@
# See: http://wiki.openstack.org/Nova/CoverageExtension for more information
# and usage explanation for this API extension
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_fixed_ips.py → novaclient/tests/v1_1/test_fixed_ips.py
@@ -15,8 +15,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-from tests.v1_1 import fakes
-from tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.tests import utils
cs = fakes.FakeClient()
View
4 tests/v1_1/test_flavor_access.py → novaclient/tests/v1_1/test_flavor_access.py
@@ -14,8 +14,8 @@
# under the License.
from novaclient.v1_1 import flavor_access
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_flavors.py → novaclient/tests/v1_1/test_flavors.py
@@ -1,7 +1,7 @@
from novaclient import exceptions
from novaclient.v1_1 import flavors
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_floating_ip_dns.py → ...client/tests/v1_1/test_floating_ip_dns.py
@@ -1,6 +1,6 @@
from novaclient.v1_1 import floating_ip_dns
-from tests.v1_1 import fakes
-from tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.tests import utils
cs = fakes.FakeClient()
View
4 tests/v1_1/test_floating_ip_pools.py → ...ient/tests/v1_1/test_floating_ip_pools.py
@@ -15,8 +15,8 @@
# under the License.
from novaclient.v1_1 import floating_ip_pools
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_floating_ips.py → novaclient/tests/v1_1/test_floating_ips.py
@@ -15,8 +15,8 @@
# under the License.
from novaclient.v1_1 import floating_ips
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_floating_ips_bulk.py → ...ient/tests/v1_1/test_floating_ips_bulk.py
@@ -15,8 +15,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from novaclient.v1_1 import floating_ips_bulk
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_fping.py → novaclient/tests/v1_1/test_fping.py
@@ -16,8 +16,8 @@
# under the License.
from novaclient.v1_1 import fping
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_hosts.py → novaclient/tests/v1_1/test_hosts.py
@@ -1,6 +1,6 @@
from novaclient.v1_1 import hosts
-from tests.v1_1 import fakes
-from tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.tests import utils
cs = fakes.FakeClient()
View
4 tests/v1_1/test_hypervisors.py → novaclient/tests/v1_1/test_hypervisors.py
@@ -13,8 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_images.py → novaclient/tests/v1_1/test_images.py
@@ -1,6 +1,6 @@
from novaclient.v1_1 import images
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_keypairs.py → novaclient/tests/v1_1/test_keypairs.py
@@ -1,6 +1,6 @@
from novaclient.v1_1 import keypairs
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_limits.py → novaclient/tests/v1_1/test_limits.py
@@ -1,7 +1,7 @@
from novaclient.v1_1 import limits
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_networks.py → novaclient/tests/v1_1/test_networks.py
@@ -1,6 +1,6 @@
from novaclient.v1_1 import networks
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_quota_classes.py → novaclient/tests/v1_1/test_quota_classes.py
@@ -13,8 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_quotas.py → novaclient/tests/v1_1/test_quotas.py
@@ -13,8 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_security_group_rules.py → ...t/tests/v1_1/test_security_group_rules.py
@@ -1,7 +1,7 @@
from novaclient import exceptions
from novaclient.v1_1 import security_group_rules
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_security_groups.py → ...client/tests/v1_1/test_security_groups.py
@@ -1,6 +1,6 @@
from novaclient.v1_1 import security_groups
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_servers.py → novaclient/tests/v1_1/test_servers.py
@@ -6,8 +6,8 @@
from novaclient import exceptions
from novaclient.v1_1 import servers
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
4 tests/v1_1/test_services.py → novaclient/tests/v1_1/test_services.py
@@ -16,8 +16,8 @@
# under the License.
from novaclient.v1_1 import services
-from tests.v1_1 import fakes
-from tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.tests import utils
cs = fakes.FakeClient()
View
4 tests/v1_1/test_shell.py → novaclient/tests/v1_1/test_shell.py
@@ -29,8 +29,8 @@
from novaclient import exceptions
from novaclient.openstack.common import timeutils
import novaclient.shell
-from tests.v1_1 import fakes
-from tests import utils
+from novaclient.tests.v1_1 import fakes
+from novaclient.tests import utils
class ShellFixture(fixtures.Fixture):
View
4 tests/v1_1/test_usage.py → novaclient/tests/v1_1/test_usage.py
@@ -1,8 +1,8 @@
import datetime
from novaclient.v1_1 import usage
-from tests import utils
-from tests.v1_1 import fakes
+from novaclient.tests import utils
+from novaclient.tests.v1_1 import fakes
cs = fakes.FakeClient()
View
0 tests/v1_1/testfile.txt → novaclient/tests/v1_1/testfile.txt
File renamed without changes.
View
0 tests/v1_1/utils.py → novaclient/tests/v1_1/utils.py
File renamed without changes.

0 comments on commit c34c371

Please sign in to comment.
Something went wrong with that request. Please try again.