Skip to content

Commit 64d9760

Browse files
underscorephilunderscorephil
committed
Merge pull request #626 from sudorandom/pytest
Covert to using pytest for the test runner
2 parents c07fa8e + e3049fe commit 64d9760

47 files changed

Lines changed: 16 additions & 16 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Thumbs.db
55
._*
66
*.pyc
77
.coverage
8+
htmlcov
89
cover/*
910
.tox
1011
docs/_build/*

‎setup.cfg‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
[nosetests]
2-
verbosity=1
3-
detailed-errors=1
1+
[pytest]
2+
python_files = *_tests.py
43

54
[wheel]
65
universal=1

‎setup.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
long_description=LONG_DESCRIPTION,
2121
author='SoftLayer Technologies, Inc.',
2222
author_email='sldn@softlayer.com',
23-
packages=find_packages(exclude=["SoftLayer.tests"]),
23+
packages=find_packages(exclude=['tests']),
2424
license='MIT',
2525
zip_safe=False,
2626
url='http://github.com/softlayer/softlayer-python',
@@ -30,7 +30,6 @@
3030
'sl = SoftLayer.CLI.deprecated:main',
3131
],
3232
},
33-
test_suite='nose.collector',
3433
install_requires=[
3534
'six >= 1.7.0',
3635
'prettytable >= 0.7.0',

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ def test_get_command_invalid(self):
3333
self.assertEqual(cmd, None)
3434

3535
def test_get_command(self):
36-
mod_path = 'SoftLayer.tests.CLI.environment_tests'
37-
fixture_loader = environment.ModuleLoader(mod_path, 'fixture_command')
36+
fixture_loader = environment.ModuleLoader(
37+
'tests.CLI.environment_tests',
38+
'fixture_command',
39+
)
3840
self.env.commands = {'fixture:run': fixture_loader}
3941
command = self.env.get_command('fixture', 'run')
4042
self.assertIsInstance(command, click.Command)

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

0 commit comments

Comments
 (0)