Moving tests to the root level

Nathan Beittenmiller · Nathan Beittenmiller · commit 6c95d5d32cf3 · 2013-08-21T08:06:22.000-05:00
diff --git a/SoftLayer/tests/mocks/__init__.py b/SoftLayer/tests/mocks/__init__.py
diff --git a/setup.py b/setup.py
@@ -46,10 +46,11 @@
     author='SoftLayer Technologies, Inc.',
     author_email='sldn@softlayer.com',
     packages=[
-        'SoftLayer',
-        'SoftLayer.CLI',
-        'SoftLayer.CLI.modules',
-        'SoftLayer.managers',
+        'tests',
+        'tests.CLI',
+        'tests.CLI.modules',
+        'tests.managers',
+        'tests.mocks',
     ],
     license='The BSD License',
     zip_safe=False,
diff --git a/tests/CLI/__init__.py b/tests/CLI/__init__.py
diff --git a/tests/CLI/core_tests.py b/tests/CLI/core_tests.py
@@ -1,5 +1,5 @@
 """
-    SoftLayer.tests.CLI.core_tests
+    tests.CLI.core_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
@@ -9,7 +9,7 @@
 
 import SoftLayer
 import SoftLayer.CLI as cli
-from SoftLayer.tests import unittest
+from tests import unittest
 from SoftLayer.CLI.helpers import CLIAbort
 from SoftLayer.CLI.environment import Environment, InvalidModule
 
diff --git a/tests/CLI/environment_tests.py b/tests/CLI/environment_tests.py
@@ -1,5 +1,5 @@
 """
-    SoftLayer.tests.CLI.environment_tests
+    tests.CLI.environment_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
@@ -9,7 +9,7 @@
 import os
 from mock import patch, MagicMock
 
-from SoftLayer.tests import unittest
+from tests import unittest
 from SoftLayer.CLI.environment import Environment, InvalidCommand
 
 if sys.version_info >= (3,):
diff --git a/tests/CLI/helper_tests.py b/tests/CLI/helper_tests.py
@@ -1,5 +1,5 @@
 """
-    SoftLayer.tests.CLI.helper_tests
+    tests.CLI.helper_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
@@ -10,7 +10,7 @@
 import json
 
 import SoftLayer.CLI as cli
-from SoftLayer.tests import FIXTURE_PATH, unittest
+from tests import FIXTURE_PATH, unittest
 from mock import patch, mock_open, call
 
 
diff --git a/tests/CLI/modules/__init__.py b/tests/CLI/modules/__init__.py
diff --git a/tests/CLI/modules/hardware_tests.py b/tests/CLI/modules/hardware_tests.py
@@ -1,5 +1,5 @@
 """
-    SoftLayer.tests.CLI.modules.hardware_tests
+    tests.CLI.modules.hardware_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     This is a series of integration tests designed to test the complete
@@ -16,6 +16,8 @@
 
 from SoftLayer.CLI.helpers import format_output, CLIAbort
 from SoftLayer.CLI.modules import server
+#from SoftLayer.CLI.modules.hardware import *
+from tests.mocks import account_mock
 
 
 class HardwareCLITests(unittest.TestCase):
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -6,4 +6,3 @@
 import os.path
 
 FIXTURE_PATH = os.path.abspath(os.path.join(__file__, '..', 'fixtures'))
-
diff --git a/tests/api_tests.py b/tests/api_tests.py
@@ -1,5 +1,5 @@
 """
-    SoftLayer.tests.api_tests
+    tests.api_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
@@ -9,7 +9,7 @@
 
 import SoftLayer
 import SoftLayer.API
-from SoftLayer.tests import unittest
+from tests import unittest
 from SoftLayer.consts import USER_AGENT
 
 
diff --git a/tests/auth_tests.py b/tests/auth_tests.py
@@ -1,13 +1,13 @@
 """
-    SoftLayer.tests.auth_tests
+    tests.auth_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
     :license: BSD, see LICENSE for more details.
 """
 from SoftLayer.auth import (
     AuthenticationBase, BasicAuthentication, TokenAuthentication)
-from SoftLayer.tests import unittest
+from tests import unittest
 
 
 class TestAuthenticationBase(unittest.TestCase):
diff --git a/tests/basic_tests.py b/tests/basic_tests.py
@@ -1,13 +1,13 @@
 """
-    SoftLayer.tests.basic_tests
+    tests.basic_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Tests shared code
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
     :license: BSD, see LICENSE for more details.
 """
 import SoftLayer
-from SoftLayer.tests import unittest
+from tests import unittest
 
 
 class TestExceptions(unittest.TestCase):
diff --git a/tests/fixtures/empty.conf b/tests/fixtures/empty.conf
diff --git a/tests/fixtures/full.conf b/tests/fixtures/full.conf
diff --git a/tests/fixtures/no_options.conf b/tests/fixtures/no_options.conf
diff --git a/tests/fixtures/sample_cci_template.conf b/tests/fixtures/sample_cci_template.conf
diff --git a/tests/functional_tests.py b/tests/functional_tests.py
@@ -1,5 +1,5 @@
 """
-    SoftLayer.tests.functional_tests
+    tests.functional_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
@@ -8,7 +8,7 @@
 import os
 
 import SoftLayer
-from SoftLayer.tests import unittest
+from tests import unittest
 
 
 def get_creds():
diff --git a/tests/managers/__init__.py b/tests/managers/__init__.py
diff --git a/tests/managers/cci_tests.py b/tests/managers/cci_tests.py
@@ -1,12 +1,12 @@
 """
-    SoftLayer.tests.managers.cci_tests
+    tests.managers.cci_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
     :license: BSD, see LICENSE for more details.
 """
 from SoftLayer import CCIManager
-from SoftLayer.tests import unittest
+from tests import unittest
 
 from mock import MagicMock, ANY, call, patch
 
diff --git a/tests/managers/dns_tests.py b/tests/managers/dns_tests.py
@@ -1,12 +1,12 @@
 """
-    SoftLayer.tests.managers.dns_tests
+    tests.managers.dns_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
     :license: BSD, see LICENSE for more details.
 """
 from SoftLayer import DNSManager, DNSZoneNotFound
-from SoftLayer.tests import unittest
+from tests import unittest
 
 from mock import MagicMock, ANY
 
diff --git a/tests/managers/firewall_tests.py b/tests/managers/firewall_tests.py
@@ -1,12 +1,12 @@
 """
-    SoftLayer.tests.managers.firewall_tests
+    tests.managers.firewall_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
     :license: BSD, see LICENSE for more details.
 """
 from SoftLayer import FirewallManager
-from SoftLayer.tests import unittest
+from tests import unittest
 
 from mock import MagicMock, ANY
 
diff --git a/tests/managers/hardware_tests.py b/tests/managers/hardware_tests.py
@@ -1,15 +1,14 @@
 """
-    SoftLayer.tests.managers.hardware_tests
+    tests.managers.hardware_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
     :license: BSD, see LICENSE for more details.
 """
 from SoftLayer import HardwareManager
 from SoftLayer.managers.hardware import get_default_value
-from SoftLayer.tests import unittest
-from SoftLayer.tests.mocks import account_mock, hardware_mock, \
-    product_package_mock
+from tests import unittest
+from tests.mocks import account_mock, hardware_mock, product_package_mock
 
 from mock import MagicMock, ANY, call, patch
 
diff --git a/tests/managers/metadata_tests.py b/tests/managers/metadata_tests.py
@@ -1,13 +1,13 @@
 """
-    SoftLayer.tests.managers.metadata_tests
+    tests.managers.metadata_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
     :license: BSD, see LICENSE for more details.
 """
 from SoftLayer import MetadataManager, SoftLayerError, SoftLayerAPIError
 from SoftLayer.consts import API_PRIVATE_ENDPOINT_REST, USER_AGENT
-from SoftLayer.tests import unittest
+from tests import unittest
 
 from mock import patch, MagicMock
 
diff --git a/tests/managers/network_tests.py b/tests/managers/network_tests.py
@@ -1,12 +1,12 @@
 """
-    SoftLayer.tests.managers.network_tests
+    tests.managers.network_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
     :license: BSD, see LICENSE for more details.
 """
 from SoftLayer import NetworkManager
-from SoftLayer.tests import unittest
+from tests import unittest
 from mock import MagicMock, ANY, call
 
 
diff --git a/tests/managers/queue_tests.py b/tests/managers/queue_tests.py
@@ -1,5 +1,5 @@
 """
-    SoftLayer.tests.managers.cci_tests
+    tests.managers.cci_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
@@ -8,7 +8,7 @@
 from SoftLayer import MessagingManager, Unauthenticated
 import SoftLayer.managers.messaging
 from SoftLayer.consts import USER_AGENT
-from SoftLayer.tests import unittest
+from tests import unittest
 
 import json
 from mock import MagicMock, patch, ANY
diff --git a/tests/managers/sshkey_tests.py b/tests/managers/sshkey_tests.py
@@ -1,12 +1,12 @@
 """
-    SoftLayer.tests.managers.sshkey_tests
+    tests.managers.sshkey_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
     :license: BSD, see LICENSE for more details.
 """
 from SoftLayer import SshKeyManager
-from SoftLayer.tests import unittest
+from tests import unittest
 from mock import MagicMock, ANY, call
 
 
diff --git a/tests/managers/ssl_tests.py b/tests/managers/ssl_tests.py
@@ -1,12 +1,12 @@
 """
-    SoftLayer.tests.managers.ssl_tests
+    tests.managers.ssl_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
     :license: BSD, see LICENSE for more details.
 """
 from SoftLayer import SSLManager
-from SoftLayer.tests import unittest
+from tests import unittest
 
 from mock import MagicMock, ANY
 
diff --git a/tests/mocks/__init__.py b/tests/mocks/__init__.py
@@ -0,0 +1,3 @@
+from . import account_mock
+from . import hardware_mock
+from . import product_package_mock
diff --git a/tests/mocks/account_mock.py b/tests/mocks/account_mock.py
@@ -1,4 +1,4 @@
-from SoftLayer.tests.mocks import hardware_mock
+from tests.mocks import hardware_mock
 from mock import MagicMock
 
 
diff --git a/tests/mocks/hardware_mock.py b/tests/mocks/hardware_mock.py
diff --git a/tests/mocks/product_package_mock.py b/tests/mocks/product_package_mock.py
diff --git a/tests/transport_tests.py b/tests/transport_tests.py
@@ -1,5 +1,5 @@
 """
-    SoftLayer.tests.transport_tests
+    tests.transport_tests
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
@@ -9,7 +9,7 @@
 
 from SoftLayer import SoftLayerAPIError, TransportError
 from SoftLayer.transport import make_rest_api_call, make_xml_rpc_api_call
-from SoftLayer.tests import unittest
+from tests import unittest
 from requests import HTTPError, RequestException
 
 
diff --git a/tox.ini b/tox.ini
@@ -12,7 +12,7 @@ deps =
 [testenv:py32]
 commands =
   {envpython} setup.py build
-  nosetests build/lib/SoftLayer/tests []
+  nosetests build/lib/tests []
 deps =
     nose
     yanc
@@ -21,7 +21,7 @@ deps =
 [testenv:py33]
 commands =
   {envpython} setup.py build
-  nosetests build/lib/SoftLayer/tests []
+  nosetests build/lib/tests []
 deps =
     nose
     yanc

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,3 @@`
`6`	`6`	`import os.path`
`7`	`7`
`8`	`8`	`FIXTURE_PATH = os.path.abspath(os.path.join(__file__, '..', 'fixtures'))`
`9`		`-`