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 | |
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')
-rw-r--r-- | ipatests/test_webui/test_automember.py | 1 | ||||
-rw-r--r-- | ipatests/test_webui/test_cert.py | 4 | ||||
-rw-r--r-- | ipatests/test_webui/test_dns.py | 4 | ||||
-rw-r--r-- | ipatests/test_webui/test_host.py | 4 | ||||
-rw-r--r-- | ipatests/test_webui/test_hostgroup.py | 6 | ||||
-rw-r--r-- | ipatests/test_webui/test_netgroup.py | 3 | ||||
-rw-r--r-- | ipatests/test_webui/test_trust.py | 8 | ||||
-rw-r--r-- | ipatests/test_webui/ui_driver.py | 22 |
8 files changed, 24 insertions, 28 deletions
diff --git a/ipatests/test_webui/test_automember.py b/ipatests/test_webui/test_automember.py index 34710cb6e..0378812cc 100644 --- a/ipatests/test_webui/test_automember.py +++ b/ipatests/test_webui/test_automember.py @@ -93,6 +93,7 @@ class test_automember(UI_driver): self.init_app() host_util = host_tasks() + host_util.setup(self.driver, self.config) domain = self.config.get('ipa_domain') host1 = 'web1.%s' % domain host2 = 'web2.%s' % domain diff --git a/ipatests/test_webui/test_cert.py b/ipatests/test_webui/test_cert.py index 979a51e84..ec704eb11 100644 --- a/ipatests/test_webui/test_cert.py +++ b/ipatests/test_webui/test_cert.py @@ -29,8 +29,8 @@ ENTITY = 'cert' class test_cert(UI_driver): - def __init__(self, *args, **kwargs): - super(test_cert, self).__init__(args, kwargs) + def setup(self, *args, **kwargs): + super(test_cert, self).setup(*args, **kwargs) if not self.has_ca(): self.skip('CA not configured') diff --git a/ipatests/test_webui/test_dns.py b/ipatests/test_webui/test_dns.py index baa5bfbb1..4ad15bd6d 100644 --- a/ipatests/test_webui/test_dns.py +++ b/ipatests/test_webui/test_dns.py @@ -87,8 +87,8 @@ CONFIG_MOD_DATA = { class test_dns(UI_driver): - def __init__(self, *args, **kwargs): - super(test_dns, self).__init__(args, kwargs) + def setup(self, *args, **kwargs): + super(test_dns, self).setup(*args, **kwargs) if not self.has_dns(): self.skip('DNS not configured') diff --git a/ipatests/test_webui/test_host.py b/ipatests/test_webui/test_host.py index 4b1d42012..368148428 100644 --- a/ipatests/test_webui/test_host.py +++ b/ipatests/test_webui/test_host.py @@ -34,8 +34,8 @@ ENTITY = 'host' class host_tasks(UI_driver): - def __init__(self, *args, **kwargs): - super(host_tasks, self).__init__(args, kwargs) + def setup(self, *args, **kwargs): + super(host_tasks, self).setup(*args, **kwargs) self.prep_data() self.prep_data2() diff --git a/ipatests/test_webui/test_hostgroup.py b/ipatests/test_webui/test_hostgroup.py index b83c0b88c..e2dbbf588 100644 --- a/ipatests/test_webui/test_hostgroup.py +++ b/ipatests/test_webui/test_hostgroup.py @@ -48,7 +48,8 @@ class test_hostgroup(UI_driver): Hostgroup associations """ self.init_app() - host = host_tasks(self.driver, self.config) + host = host_tasks() + host.setup(self.driver, self.config) # prepare # ------- @@ -89,7 +90,8 @@ class test_hostgroup(UI_driver): Hostgroup indirect associations """ self.init_app() - host = host_tasks(self.driver, self.config) + host = host_tasks() + host.setup(self.driver, self.config) # add # --- diff --git a/ipatests/test_webui/test_netgroup.py b/ipatests/test_webui/test_netgroup.py index 55333e54b..3dfea0dfa 100644 --- a/ipatests/test_webui/test_netgroup.py +++ b/ipatests/test_webui/test_netgroup.py @@ -46,7 +46,8 @@ class test_netgroup(UI_driver): Mod: netgroup """ self.init_app() - host = host_tasks(self.driver, self.config) + host = host_tasks() + host.setup(self.driver, self.config) self.add_record(netgroup.ENTITY, netgroup.DATA2) self.add_record(user.ENTITY, user.DATA) diff --git a/ipatests/test_webui/test_trust.py b/ipatests/test_webui/test_trust.py index 95e0fedda..138eabf2e 100644 --- a/ipatests/test_webui/test_trust.py +++ b/ipatests/test_webui/test_trust.py @@ -95,9 +95,8 @@ class trust_tasks(UI_driver): class test_trust(trust_tasks): - def __init__(self, *args, **kwargs): - super(test_trust, self).__init__(args, kwargs) - + def setup(self, *args, **kwargs): + super(test_trust, self).setup(*args, **kwargs) if not self.has_trusts(): self.skip('Trusts not configured') @@ -121,7 +120,8 @@ class test_trust(trust_tasks): self.init_app() - r_tasks = range_tasks(self.driver, self.config) + r_tasks = range_tasks() + r_tasks.setup(self.driver, self.config) r_tasks.get_shifts() range_add = r_tasks.get_add_data('') base_id = range_add[2][2] 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 |