Skip to content

Commit 2ee940e

Browse files
author
Nathan Beittenmiller
committed
Moving tests back under SoftLayer due to repeated failures under 3.x. Minor other fixes based on code review notes
1 parent dc4d8c0 commit 2ee940e

34 files changed

Lines changed: 107 additions & 76 deletions

tests/CLI/__init__.py renamed to SoftLayer/tests/CLI/__init__.py

File renamed without changes.

tests/CLI/core_tests.py renamed to SoftLayer/tests/CLI/core_tests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
2-
tests.CLI.core_tests
3-
~~~~~~~~~~~~~~~~~~~~
2+
SoftLayer.tests.CLI.core_tests
3+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
44
55
:copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
66
:license: BSD, see LICENSE for more details.
@@ -9,7 +9,7 @@
99

1010
import SoftLayer
1111
import SoftLayer.CLI as cli
12-
from tests import unittest
12+
from SoftLayer.tests import unittest
1313
from SoftLayer.CLI.helpers import CLIAbort
1414
from SoftLayer.CLI.environment import Environment, InvalidModule
1515

tests/CLI/environment_tests.py renamed to SoftLayer/tests/CLI/environment_tests.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
2-
tests.CLI.environment_tests
3-
~~~~~~~~~~~~~~~~~~~~~~~~~~~
2+
SoftLayer.tests.CLI.environment_tests
3+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
44
55
:copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
66
:license: BSD, see LICENSE for more details.
@@ -9,7 +9,8 @@
99
import os
1010
from mock import patch, MagicMock
1111

12-
from tests import unittest
12+
from SoftLayer import API_PUBLIC_ENDPOINT
13+
from SoftLayer.tests import FIXTURE_PATH, unittest
1314
from SoftLayer.CLI.environment import Environment, InvalidCommand
1415

1516
if sys.version_info >= (3,):

tests/CLI/helper_tests.py renamed to SoftLayer/tests/CLI/helper_tests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
2-
tests.CLI.helper_tests
3-
~~~~~~~~~~~~~~~~~~~~~~
2+
SoftLayer.tests.CLI.helper_tests
3+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
44
55
:copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
66
:license: BSD, see LICENSE for more details.
@@ -10,7 +10,7 @@
1010
import json
1111

1212
import SoftLayer.CLI as cli
13-
from tests import FIXTURE_PATH, unittest
13+
from SoftLayer.tests import FIXTURE_PATH, unittest
1414
from mock import patch, mock_open, call
1515

1616

tests/CLI/modules/__init__.py renamed to SoftLayer/tests/CLI/modules/__init__.py

File renamed without changes.

tests/CLI/modules/bmc_tests.py renamed to SoftLayer/tests/CLI/modules/bmc_tests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
2-
tests.CLI.modules.bmc_tests
3-
~~~~~~~~~~~~~~~~~~~~~~~~~~~
2+
SoftLayer.tests.CLI.modules.bmc_tests
3+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
44
55
This is a series of integration tests designed to test the complete
66
command line interface.
@@ -16,7 +16,7 @@
1616

1717
from SoftLayer.CLI.helpers import format_output, CLIAbort, ArgumentError
1818
from SoftLayer.CLI.modules import bmc
19-
from tests.mocks import product_package_mock
19+
from SoftLayer.tests.mocks import product_package_mock
2020

2121

2222
class BMCCLITests(unittest.TestCase):

tests/CLI/modules/server_tests.py renamed to SoftLayer/tests/CLI/modules/server_tests.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
2-
tests.CLI.modules.server_tests
3-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2+
SoftLayer.tests.CLI.modules.server_tests
3+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
44
55
This is a series of integration tests designed to test the complete
66
command line interface.
@@ -22,7 +22,8 @@
2222

2323
from SoftLayer.CLI.helpers import format_output, CLIAbort, ArgumentError
2424
from SoftLayer.CLI.modules import server
25-
from tests.mocks import account_mock, hardware_mock, product_package_mock
25+
from SoftLayer.tests.mocks import account_mock, hardware_mock, \
26+
product_package_mock
2627

2728

2829
class ServerCLITests(unittest.TestCase):

tests/__init__.py renamed to SoftLayer/tests/__init__.py

File renamed without changes.

tests/api_tests.py renamed to SoftLayer/tests/api_tests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""
2-
tests.api_tests
3-
~~~~~~~~~~~~~~~
2+
SoftLayer.tests.api_tests
3+
~~~~~~~~~~~~~~~~~~~~~~~~~
44
55
:copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
66
:license: BSD, see LICENSE for more details.
@@ -9,7 +9,7 @@
99

1010
import SoftLayer
1111
import SoftLayer.API
12-
from tests import unittest
12+
from SoftLayer.tests import unittest
1313
from SoftLayer.consts import USER_AGENT
1414

1515

tests/auth_tests.py renamed to SoftLayer/tests/auth_tests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
"""
2-
tests.auth_tests
3-
~~~~~~~~~~~~~~~~
2+
SoftLayer.tests.auth_tests
3+
~~~~~~~~~~~~~~~~~~~~~~~~~~
44
55
:copyright: (c) 2013, SoftLayer Technologies, Inc. All rights reserved.
66
:license: BSD, see LICENSE for more details.
77
"""
88
from SoftLayer.auth import (
99
AuthenticationBase, BasicAuthentication, TokenAuthentication)
10-
from tests import unittest
10+
from SoftLayer.tests import unittest
1111

1212

1313
class TestAuthenticationBase(unittest.TestCase):

0 commit comments

Comments
 (0)