summaryrefslogtreecommitdiffstats
path: root/ipatests/test_cmdline/cmdline.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2014-10-07 12:48:22 +0200
committerTomas Babej <tbabej@redhat.com>2014-11-21 12:14:44 +0100
commit375e9f7c4b855ee8abbab6b5574d54bbd9fb1742 (patch)
tree88cf59d1736cc9fb3bf23c6a8c63f4c498ebf06a /ipatests/test_cmdline/cmdline.py
parent7de424f42541e73ed24a95f1dd90ff4a61e111fa (diff)
downloadfreeipa-375e9f7c4b855ee8abbab6b5574d54bbd9fb1742.tar.gz
freeipa-375e9f7c4b855ee8abbab6b5574d54bbd9fb1742.tar.xz
freeipa-375e9f7c4b855ee8abbab6b5574d54bbd9fb1742.zip
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>
Diffstat (limited to 'ipatests/test_cmdline/cmdline.py')
-rw-r--r--ipatests/test_cmdline/cmdline.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/ipatests/test_cmdline/cmdline.py b/ipatests/test_cmdline/cmdline.py
index e790f022e..bcb71328a 100644
--- a/ipatests/test_cmdline/cmdline.py
+++ b/ipatests/test_cmdline/cmdline.py
@@ -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()