tests: Use PEP8-compliant setup/teardown method names

The setUp/dearDown names are used in the unittest module, but there is no reason
to use them in non-`unittest` test cases.
Nose supports both styles (but mixing them can cause trouble when
calling super()'s methods).
Pytest only supports the new ones.

https://fedorahosted.org/freeipa/ticket/4610

Reviewed-By: Tomas Babej <tbabej@redhat.com>
This commit is contained in:
Petr Viktorin
2014-10-07 12:48:22 +02:00
committed by Tomas Babej
parent 7de424f425
commit 375e9f7c4b
21 changed files with 56 additions and 62 deletions

View File

@@ -52,7 +52,7 @@ class cmdline_test(XMLRPC_test):
# some reasonable default command
command = paths.LS
def setUp(self):
def setup(self):
# Find the executable in $PATH
# This is neded because ipautil.run resets the PATH to
# a system default.
@@ -65,14 +65,14 @@ class cmdline_test(XMLRPC_test):
raise AssertionError(
'Command %r not available' % original_command
)
super(cmdline_test, self).setUp()
super(cmdline_test, self).setup()
if not server_available:
raise nose.SkipTest(
'Server not available: %r' % api.env.xmlrpc_uri
)
def tearDown(self):
def teardown(self):
"""
nose tear-down fixture.
"""
super(cmdline_test, self).tearDown()
super(cmdline_test, self).teardown()