diff options
author | Petr Viktorin <pviktori@redhat.com> | 2014-10-10 16:04:05 +0200 |
---|---|---|
committer | Tomas Babej <tbabej@redhat.com> | 2014-11-21 12:14:44 +0100 |
commit | 82e41dc7a45d4fb3cce18216ef2b8d5daea957b1 (patch) | |
tree | cb0f56ee50e3dc78d92eb4690c62682b6a311524 /ipatests/test_webui/ui_driver.py | |
parent | b64f91fb437a1e05070053ae709903067eb5901d (diff) | |
download | freeipa-82e41dc7a45d4fb3cce18216ef2b8d5daea957b1.tar.gz freeipa-82e41dc7a45d4fb3cce18216ef2b8d5daea957b1.tar.xz freeipa-82e41dc7a45d4fb3cce18216ef2b8d5daea957b1.zip |
test_webui: Don't use __init__ for test classes
https://fedorahosted.org/freeipa/ticket/4610
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipatests/test_webui/ui_driver.py')
-rw-r--r-- | ipatests/test_webui/ui_driver.py | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/ipatests/test_webui/ui_driver.py b/ipatests/test_webui/ui_driver.py index e706a68e0..451e61cc0 100644 --- a/ipatests/test_webui/ui_driver.py +++ b/ipatests/test_webui/ui_driver.py @@ -117,12 +117,18 @@ class UI_driver(object): if NO_SELENIUM: raise nose.SkipTest('Selenium not installed') - def __init__(self, driver=None, config=None): + def setup(self, driver=None, config=None): self.request_timeout = 30 self.driver = driver self.config = config if not config: self.load_config() + if not self.driver: + self.driver = self.get_driver() + self.get_driver().maximize_window() + + def teardown(self): + self.driver.quit() def load_config(self): """ @@ -161,20 +167,6 @@ class UI_driver(object): if 'type' not in c: c['type'] = DEFAULT_TYPE - def setup(self): - """ - Test setup - """ - if not self.driver: - self.driver = self.get_driver() - self.driver.maximize_window() - - def teardown(self): - """ - Test clean up - """ - self.driver.quit() - def get_driver(self): """ Get WebDriver according to configuration |