From 375e9f7c4b855ee8abbab6b5574d54bbd9fb1742 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Tue, 7 Oct 2014 12:48:22 +0200 Subject: 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 --- ipatests/test_webui/ui_driver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ipatests/test_webui') diff --git a/ipatests/test_webui/ui_driver.py b/ipatests/test_webui/ui_driver.py index bf78fcb57..e706a68e0 100644 --- a/ipatests/test_webui/ui_driver.py +++ b/ipatests/test_webui/ui_driver.py @@ -113,7 +113,7 @@ class UI_driver(object): """ @classmethod - def setUpClass(cls): + def setup_class(cls): if NO_SELENIUM: raise nose.SkipTest('Selenium not installed') @@ -161,7 +161,7 @@ class UI_driver(object): if 'type' not in c: c['type'] = DEFAULT_TYPE - def setUp(self): + def setup(self): """ Test setup """ @@ -169,7 +169,7 @@ class UI_driver(object): self.driver = self.get_driver() self.driver.maximize_window() - def tearDown(self): + def teardown(self): """ Test clean up """ -- cgit