summaryrefslogtreecommitdiffstats
path: root/ipatests/test_webui
diff options
context:
space:
mode:
authorMilan Kubik <mkubik@redhat.com>2015-04-24 14:39:48 +0200
committerMartin Basti <mbasti@redhat.com>2015-11-09 11:49:17 +0100
commit0a64e9bd7061550b478be889b0e7fc90f560b06c (patch)
tree125f97a97bfab06c06dadbef1b7983e0d5f97263 /ipatests/test_webui
parent4d94367006287ed0a04c092a7b86096518cf5b8c (diff)
downloadfreeipa-0a64e9bd7061550b478be889b0e7fc90f560b06c.tar.gz
freeipa-0a64e9bd7061550b478be889b0e7fc90f560b06c.tar.xz
freeipa-0a64e9bd7061550b478be889b0e7fc90f560b06c.zip
Applied tier0 and tier1 marks on unit tests and xmlrpc tests
Web UI tests were marked as tier1 tests. The tier system is intended to be used together with CI system to make sure the more complicated tests are being run only when all of the basic functionality is working. The system is using pytest's marker system. E.g. an invocation of all tier1 tests with listing will look like: $ py.test -v -m tier1 ipatests or in case of out of tree tests: $ ipa-run-tests -m tier1 Reviewed-By: Ales 'alich' Marecek <amarecek@redhat.com>
Diffstat (limited to 'ipatests/test_webui')
-rw-r--r--ipatests/test_webui/test_automember.py2
-rw-r--r--ipatests/test_webui/test_automount.py2
-rw-r--r--ipatests/test_webui/test_cert.py2
-rw-r--r--ipatests/test_webui/test_config.py2
-rw-r--r--ipatests/test_webui/test_delegation.py2
-rw-r--r--ipatests/test_webui/test_dns.py2
-rw-r--r--ipatests/test_webui/test_group.py2
-rw-r--r--ipatests/test_webui/test_hbac.py2
-rw-r--r--ipatests/test_webui/test_host.py3
-rw-r--r--ipatests/test_webui/test_hostgroup.py2
-rw-r--r--ipatests/test_webui/test_krbtpolicy.py2
-rw-r--r--ipatests/test_webui/test_navigation.py2
-rw-r--r--ipatests/test_webui/test_netgroup.py2
-rw-r--r--ipatests/test_webui/test_pwpolicy.py2
-rw-r--r--ipatests/test_webui/test_range.py2
-rw-r--r--ipatests/test_webui/test_rbac.py2
-rw-r--r--ipatests/test_webui/test_realmdomains.py2
-rw-r--r--ipatests/test_webui/test_selfservice.py2
-rw-r--r--ipatests/test_webui/test_selinuxusermap.py2
-rw-r--r--ipatests/test_webui/test_service.py3
-rw-r--r--ipatests/test_webui/test_sudo.py2
-rw-r--r--ipatests/test_webui/test_trust.py3
-rw-r--r--ipatests/test_webui/test_user.py2
23 files changed, 49 insertions, 0 deletions
diff --git a/ipatests/test_webui/test_automember.py b/ipatests/test_webui/test_automember.py
index 0378812cc..8d07c8c99 100644
--- a/ipatests/test_webui/test_automember.py
+++ b/ipatests/test_webui/test_automember.py
@@ -25,6 +25,7 @@ from ipatests.test_webui.ui_driver import UI_driver
from ipatests.test_webui.ui_driver import screenshot
import ipatests.test_webui.data_hostgroup as hostgroup
from ipatests.test_webui.test_host import host_tasks
+import pytest
ENTITY = 'automember'
@@ -50,6 +51,7 @@ HOST_GROUP_DATA = {
}
+@pytest.mark.tier1
class test_automember(UI_driver):
@screenshot
diff --git a/ipatests/test_webui/test_automount.py b/ipatests/test_webui/test_automount.py
index 8a748abe4..9bb64ccf4 100644
--- a/ipatests/test_webui/test_automount.py
+++ b/ipatests/test_webui/test_automount.py
@@ -23,6 +23,7 @@ Automount tests
from ipatests.test_webui.ui_driver import UI_driver
from ipatests.test_webui.ui_driver import screenshot
+import pytest
LOC_ENTITY = 'automountlocation'
MAP_ENTITY = 'automountmap'
@@ -61,6 +62,7 @@ KEY_DATA = {
}
+@pytest.mark.tier1
class test_automount(UI_driver):
@screenshot
diff --git a/ipatests/test_webui/test_cert.py b/ipatests/test_webui/test_cert.py
index ec704eb11..c1a3461ad 100644
--- a/ipatests/test_webui/test_cert.py
+++ b/ipatests/test_webui/test_cert.py
@@ -23,10 +23,12 @@ Cert tests
from ipatests.test_webui.ui_driver import UI_driver
from ipatests.test_webui.ui_driver import screenshot
+import pytest
ENTITY = 'cert'
+@pytest.mark.tier1
class test_cert(UI_driver):
def setup(self, *args, **kwargs):
diff --git a/ipatests/test_webui/test_config.py b/ipatests/test_webui/test_config.py
index edeec10db..b64e90f14 100644
--- a/ipatests/test_webui/test_config.py
+++ b/ipatests/test_webui/test_config.py
@@ -23,6 +23,7 @@ Config tests
from ipatests.test_webui.ui_driver import UI_driver
from ipatests.test_webui.ui_driver import screenshot
+import pytest
ENTITY = 'config'
@@ -41,6 +42,7 @@ DATA2 = {
}
+@pytest.mark.tier1
class test_config(UI_driver):
@screenshot
diff --git a/ipatests/test_webui/test_delegation.py b/ipatests/test_webui/test_delegation.py
index a3e70609f..5c2b380d3 100644
--- a/ipatests/test_webui/test_delegation.py
+++ b/ipatests/test_webui/test_delegation.py
@@ -23,6 +23,7 @@ Delegation tests
from ipatests.test_webui.ui_driver import UI_driver
from ipatests.test_webui.ui_driver import screenshot
+import pytest
ENTITY = 'delegation'
PKEY = 'itest-delegation-rule'
@@ -42,6 +43,7 @@ DATA = {
}
+@pytest.mark.tier1
class test_delegation(UI_driver):
@screenshot
diff --git a/ipatests/test_webui/test_dns.py b/ipatests/test_webui/test_dns.py
index 4ad15bd6d..a576db9df 100644
--- a/ipatests/test_webui/test_dns.py
+++ b/ipatests/test_webui/test_dns.py
@@ -23,6 +23,7 @@ DNS tests
from ipatests.test_webui.ui_driver import UI_driver
from ipatests.test_webui.ui_driver import screenshot
+import pytest
ZONE_ENTITY = 'dnszone'
FORWARD_ZONE_ENTITY = 'dnsforwardzone'
@@ -85,6 +86,7 @@ CONFIG_MOD_DATA = {
}
+@pytest.mark.tier1
class test_dns(UI_driver):
def setup(self, *args, **kwargs):
diff --git a/ipatests/test_webui/test_group.py b/ipatests/test_webui/test_group.py
index 06b34d089..91ae2d23e 100644
--- a/ipatests/test_webui/test_group.py
+++ b/ipatests/test_webui/test_group.py
@@ -29,8 +29,10 @@ import ipatests.test_webui.data_netgroup as netgroup
import ipatests.test_webui.data_hbac as hbac
import ipatests.test_webui.test_rbac as rbac
import ipatests.test_webui.data_sudo as sudo
+import pytest
+@pytest.mark.tier1
class test_group(UI_driver):
@screenshot
diff --git a/ipatests/test_webui/test_hbac.py b/ipatests/test_webui/test_hbac.py
index c497a2acb..d8e9f9ecf 100644
--- a/ipatests/test_webui/test_hbac.py
+++ b/ipatests/test_webui/test_hbac.py
@@ -25,8 +25,10 @@ from ipatests.test_webui.ui_driver import UI_driver
from ipatests.test_webui.ui_driver import screenshot
import ipatests.test_webui.data_hbac as hbac
import ipatests.test_webui.data_hostgroup as hostgroup
+import pytest
+@pytest.mark.tier1
class test_hbac(UI_driver):
@screenshot
diff --git a/ipatests/test_webui/test_host.py b/ipatests/test_webui/test_host.py
index 368148428..7ee6b4bac 100644
--- a/ipatests/test_webui/test_host.py
+++ b/ipatests/test_webui/test_host.py
@@ -28,10 +28,12 @@ import ipatests.test_webui.data_netgroup as netgroup
import ipatests.test_webui.data_hbac as hbac
import ipatests.test_webui.test_rbac as rbac
import ipatests.test_webui.data_sudo as sudo
+import pytest
ENTITY = 'host'
+@pytest.mark.tier1
class host_tasks(UI_driver):
def setup(self, *args, **kwargs):
@@ -103,6 +105,7 @@ class host_tasks(UI_driver):
return csr
+@pytest.mark.tier1
class test_host(host_tasks):
@screenshot
diff --git a/ipatests/test_webui/test_hostgroup.py b/ipatests/test_webui/test_hostgroup.py
index e2dbbf588..1879bad8c 100644
--- a/ipatests/test_webui/test_hostgroup.py
+++ b/ipatests/test_webui/test_hostgroup.py
@@ -29,8 +29,10 @@ import ipatests.test_webui.data_netgroup as netgroup
import ipatests.test_webui.data_hbac as hbac
import ipatests.test_webui.test_rbac as rbac
import ipatests.test_webui.data_sudo as sudo
+import pytest
+@pytest.mark.tier1
class test_hostgroup(UI_driver):
@screenshot
diff --git a/ipatests/test_webui/test_krbtpolicy.py b/ipatests/test_webui/test_krbtpolicy.py
index 0b9252efc..2bfb96482 100644
--- a/ipatests/test_webui/test_krbtpolicy.py
+++ b/ipatests/test_webui/test_krbtpolicy.py
@@ -23,6 +23,7 @@ Kerberos policy tests
from ipatests.test_webui.ui_driver import UI_driver
from ipatests.test_webui.ui_driver import screenshot
+import pytest
ENTITY = 'krbtpolicy'
@@ -41,6 +42,7 @@ DATA2 = {
}
+@pytest.mark.tier1
class test_krbtpolicy(UI_driver):
@screenshot
diff --git a/ipatests/test_webui/test_navigation.py b/ipatests/test_webui/test_navigation.py
index 530a757ad..b5dc928ac 100644
--- a/ipatests/test_webui/test_navigation.py
+++ b/ipatests/test_webui/test_navigation.py
@@ -23,6 +23,7 @@ Basic ui tests
from ipatests.test_webui.ui_driver import UI_driver
from ipatests.test_webui.ui_driver import screenshot
+import pytest
ENTITIES = [
@@ -65,6 +66,7 @@ ENTITIES = [
]
+@pytest.mark.tier1
class test_navigation(UI_driver):
@screenshot
diff --git a/ipatests/test_webui/test_netgroup.py b/ipatests/test_webui/test_netgroup.py
index 3dfea0dfa..05036366e 100644
--- a/ipatests/test_webui/test_netgroup.py
+++ b/ipatests/test_webui/test_netgroup.py
@@ -28,8 +28,10 @@ import ipatests.test_webui.data_user as user
import ipatests.test_webui.data_group as group
import ipatests.test_webui.data_hostgroup as hostgroup
from ipatests.test_webui.test_host import host_tasks, ENTITY as HOST_ENTITY
+import pytest
+@pytest.mark.tier1
class test_netgroup(UI_driver):
@screenshot
diff --git a/ipatests/test_webui/test_pwpolicy.py b/ipatests/test_webui/test_pwpolicy.py
index 7abdfd667..91dee21dc 100644
--- a/ipatests/test_webui/test_pwpolicy.py
+++ b/ipatests/test_webui/test_pwpolicy.py
@@ -23,6 +23,7 @@ Password policy tests
from ipatests.test_webui.ui_driver import UI_driver
from ipatests.test_webui.ui_driver import screenshot
+import pytest
ENTITY = 'pwpolicy'
DATA = {
@@ -44,6 +45,7 @@ DATA = {
}
+@pytest.mark.tier1
class test_pwpolicy(UI_driver):
@screenshot
diff --git a/ipatests/test_webui/test_range.py b/ipatests/test_webui/test_range.py
index e1c46e50a..35d2d60d9 100644
--- a/ipatests/test_webui/test_range.py
+++ b/ipatests/test_webui/test_range.py
@@ -24,11 +24,13 @@ Range tests
import ipatests.test_webui.test_trust as trust_mod
from ipatests.test_webui.ui_driver import screenshot
from ipatests.test_webui.task_range import range_tasks
+import pytest
ENTITY = 'idrange'
PKEY = 'itest-range'
+@pytest.mark.tier1
class test_range(range_tasks):
@screenshot
diff --git a/ipatests/test_webui/test_rbac.py b/ipatests/test_webui/test_rbac.py
index 07cc28826..0f819ddc4 100644
--- a/ipatests/test_webui/test_rbac.py
+++ b/ipatests/test_webui/test_rbac.py
@@ -23,6 +23,7 @@ RBAC tests
from ipatests.test_webui.ui_driver import UI_driver
from ipatests.test_webui.ui_driver import screenshot
+import pytest
ROLE_ENTITY = 'role'
ROLE_DEF_FACET = 'member_user'
@@ -70,6 +71,7 @@ PERMISSION_DATA = {
}
+@pytest.mark.tier1
class test_rbac(UI_driver):
@screenshot
diff --git a/ipatests/test_webui/test_realmdomains.py b/ipatests/test_webui/test_realmdomains.py
index 87af690c7..e7737c932 100644
--- a/ipatests/test_webui/test_realmdomains.py
+++ b/ipatests/test_webui/test_realmdomains.py
@@ -23,10 +23,12 @@ Realm domains tests
from ipatests.test_webui.ui_driver import UI_driver
from ipatests.test_webui.ui_driver import screenshot
+import pytest
ENTITY = 'realmdomains'
+@pytest.mark.tier1
class test_realmdomains(UI_driver):
@screenshot
diff --git a/ipatests/test_webui/test_selfservice.py b/ipatests/test_webui/test_selfservice.py
index 15fd23d4e..e7c031b33 100644
--- a/ipatests/test_webui/test_selfservice.py
+++ b/ipatests/test_webui/test_selfservice.py
@@ -23,6 +23,7 @@ Selfservice tests
from ipatests.test_webui.ui_driver import UI_driver
from ipatests.test_webui.ui_driver import screenshot
+import pytest
ENTITY = 'selfservice'
PKEY = 'itest-selfservice-rule'
@@ -39,6 +40,7 @@ DATA = {
}
+@pytest.mark.tier1
class test_selfservice(UI_driver):
@screenshot
diff --git a/ipatests/test_webui/test_selinuxusermap.py b/ipatests/test_webui/test_selinuxusermap.py
index 65f7f33dd..77216891d 100644
--- a/ipatests/test_webui/test_selinuxusermap.py
+++ b/ipatests/test_webui/test_selinuxusermap.py
@@ -27,6 +27,7 @@ import ipatests.test_webui.data_user as user
import ipatests.test_webui.data_group as group
import ipatests.test_webui.data_hostgroup as hostgroup
from ipatests.test_webui.test_host import host_tasks, ENTITY as HOST_ENTITY
+import pytest
ENTITY = 'selinuxusermap'
PKEY = 'itest-selinuxusermap'
@@ -42,6 +43,7 @@ DATA = {
}
+@pytest.mark.tier1
class test_selinuxusermap(UI_driver):
@screenshot
diff --git a/ipatests/test_webui/test_service.py b/ipatests/test_webui/test_service.py
index c882a1cad..f582b688c 100644
--- a/ipatests/test_webui/test_service.py
+++ b/ipatests/test_webui/test_service.py
@@ -23,10 +23,12 @@ Service tests
from ipatests.test_webui.ui_driver import UI_driver
from ipatests.test_webui.ui_driver import screenshot
+import pytest
ENTITY = 'service'
+@pytest.mark.tier1
class sevice_tasks(UI_driver):
def prep_data(self):
@@ -59,6 +61,7 @@ class sevice_tasks(UI_driver):
return pkey
+@pytest.mark.tier1
class test_service(sevice_tasks):
@screenshot
diff --git a/ipatests/test_webui/test_sudo.py b/ipatests/test_webui/test_sudo.py
index ab484a09e..eb6430fd0 100644
--- a/ipatests/test_webui/test_sudo.py
+++ b/ipatests/test_webui/test_sudo.py
@@ -29,8 +29,10 @@ import ipatests.test_webui.data_user as user
import ipatests.test_webui.data_group as group
import ipatests.test_webui.data_hostgroup as hostgroup
from ipatests.test_webui.test_host import host_tasks, ENTITY as HOST_ENTITY
+import pytest
+@pytest.mark.tier1
class test_sudo(UI_driver):
@screenshot
diff --git a/ipatests/test_webui/test_trust.py b/ipatests/test_webui/test_trust.py
index 138eabf2e..621b2d477 100644
--- a/ipatests/test_webui/test_trust.py
+++ b/ipatests/test_webui/test_trust.py
@@ -24,6 +24,7 @@ Trust tests
from ipatests.test_webui.ui_driver import UI_driver
from ipatests.test_webui.ui_driver import screenshot
from ipatests.test_webui.task_range import range_tasks
+import pytest
ENTITY = 'trust'
CONFIG_ENTITY = 'trustconfig'
@@ -41,6 +42,7 @@ CONFIG_DATA2 = {
}
+@pytest.mark.tier1
class trust_tasks(UI_driver):
def get_data(self, add_data=None):
@@ -93,6 +95,7 @@ class trust_tasks(UI_driver):
return domain.upper() + '_id_range'
+@pytest.mark.tier1
class test_trust(trust_tasks):
def setup(self, *args, **kwargs):
diff --git a/ipatests/test_webui/test_user.py b/ipatests/test_webui/test_user.py
index d7087b906..b216125b2 100644
--- a/ipatests/test_webui/test_user.py
+++ b/ipatests/test_webui/test_user.py
@@ -29,6 +29,7 @@ import ipatests.test_webui.data_netgroup as netgroup
import ipatests.test_webui.data_hbac as hbac
import ipatests.test_webui.test_rbac as rbac
import ipatests.test_webui.data_sudo as sudo
+import pytest
try:
from selenium.webdriver.common.by import By
@@ -36,6 +37,7 @@ except ImportError:
pass
+@pytest.mark.tier1
class test_user(UI_driver):
@screenshot