summaryrefslogtreecommitdiffstats
path: root/ipatests/test_xmlrpc
diff options
context:
space:
mode:
Diffstat (limited to 'ipatests/test_xmlrpc')
-rw-r--r--ipatests/test_xmlrpc/test_add_remove_cert_cmd.py5
-rw-r--r--ipatests/test_xmlrpc/test_attr.py3
-rw-r--r--ipatests/test_xmlrpc/test_automember_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_automount_plugin.py7
-rw-r--r--ipatests/test_xmlrpc/test_baseldap_plugin.py5
-rw-r--r--ipatests/test_xmlrpc/test_batch_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_caacl_plugin.py3
-rw-r--r--ipatests/test_xmlrpc/test_caacl_profile_enforcement.py4
-rw-r--r--ipatests/test_xmlrpc/test_cert_plugin.py5
-rw-r--r--ipatests/test_xmlrpc/test_certprofile_plugin.py4
-rw-r--r--ipatests/test_xmlrpc/test_config_plugin.py3
-rw-r--r--ipatests/test_xmlrpc/test_delegation_plugin.py3
-rw-r--r--ipatests/test_xmlrpc/test_dns_plugin.py7
-rw-r--r--ipatests/test_xmlrpc/test_dns_realmdomains_integration.py2
-rw-r--r--ipatests/test_xmlrpc/test_external_members.py2
-rw-r--r--ipatests/test_xmlrpc/test_group_plugin.py6
-rw-r--r--ipatests/test_xmlrpc/test_hbac_plugin.py3
-rw-r--r--ipatests/test_xmlrpc/test_hbacsvcgroup_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_hbactest_plugin.py4
-rw-r--r--ipatests/test_xmlrpc/test_host_plugin.py10
-rw-r--r--ipatests/test_xmlrpc/test_hostgroup_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_idviews_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_krbtpolicy.py5
-rw-r--r--ipatests/test_xmlrpc/test_nesting.py2
-rw-r--r--ipatests/test_xmlrpc/test_netgroup_plugin.py3
-rw-r--r--ipatests/test_xmlrpc/test_old_permission_plugin.py3
-rw-r--r--ipatests/test_xmlrpc/test_passwd_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_permission_plugin.py11
-rw-r--r--ipatests/test_xmlrpc/test_ping_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_privilege_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_pwpolicy_plugin.py4
-rw-r--r--ipatests/test_xmlrpc/test_radiusproxy_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_range_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_realmdomains_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_replace.py2
-rw-r--r--ipatests/test_xmlrpc/test_role_plugin.py3
-rw-r--r--ipatests/test_xmlrpc/test_selfservice_plugin.py3
-rw-r--r--ipatests/test_xmlrpc/test_selinuxusermap_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_service_plugin.py5
-rw-r--r--ipatests/test_xmlrpc/test_servicedelegation_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_stageuser_plugin.py9
-rw-r--r--ipatests/test_xmlrpc/test_sudocmd_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py3
-rw-r--r--ipatests/test_xmlrpc/test_sudorule_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_trust_plugin.py3
-rw-r--r--ipatests/test_xmlrpc/test_user_plugin.py3
-rw-r--r--ipatests/test_xmlrpc/test_vault_plugin.py2
47 files changed, 166 insertions, 1 deletions
diff --git a/ipatests/test_xmlrpc/test_add_remove_cert_cmd.py b/ipatests/test_xmlrpc/test_add_remove_cert_cmd.py
index c0669c093..122921d79 100644
--- a/ipatests/test_xmlrpc/test_add_remove_cert_cmd.py
+++ b/ipatests/test_xmlrpc/test_add_remove_cert_cmd.py
@@ -10,8 +10,10 @@ from ipatests.util import assert_deepequal, raises
from xmlrpc_test import XMLRPC_test
from ipapython.dn import DN
from testcert import get_testcert
+import pytest
+@pytest.mark.tier1
class CertManipCmdTestBase(XMLRPC_test):
entity_class = ''
entity_pkey = None
@@ -270,6 +272,7 @@ class CertManipCmdTestBase(XMLRPC_test):
)
+@pytest.mark.tier1
class TestCertManipCmdUser(CertManipCmdTestBase):
entity_class = 'user'
entity_pkey = u'tuser'
@@ -299,6 +302,7 @@ class TestCertManipCmdUser(CertManipCmdTestBase):
cls.default_caacl, **cls.cmd_options['caacl'])
+@pytest.mark.tier1
class TestCertManipCmdHost(CertManipCmdTestBase):
entity_class = 'host'
entity_pkey = u'host.example.com'
@@ -317,6 +321,7 @@ class TestCertManipCmdHost(CertManipCmdTestBase):
cert_del_summary = u'Removed certificates from host "%s"'
+@pytest.mark.tier1
class TestCertManipCmdService(CertManipCmdTestBase):
entity_class = 'service'
entity_pkey = u'testservice/%s@%s' % (TestCertManipCmdHost.entity_pkey,
diff --git a/ipatests/test_xmlrpc/test_attr.py b/ipatests/test_xmlrpc/test_attr.py
index d04999a99..9248ce044 100644
--- a/ipatests/test_xmlrpc/test_attr.py
+++ b/ipatests/test_xmlrpc/test_attr.py
@@ -24,9 +24,12 @@ Test --setattr and --addattr and other attribute-specific issues
from ipalib import errors
from ipatests.test_xmlrpc.xmlrpc_test import Declarative
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
+import pytest
user1=u'tuser1'
+
+@pytest.mark.tier1
class test_attr(Declarative):
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_automember_plugin.py b/ipatests/test_xmlrpc/test_automember_plugin.py
index 760964dc0..be0f73905 100644
--- a/ipatests/test_xmlrpc/test_automember_plugin.py
+++ b/ipatests/test_xmlrpc/test_automember_plugin.py
@@ -29,6 +29,7 @@ from ipatests.test_xmlrpc.xmlrpc_test import (
fuzzy_automember_message)
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
+import pytest
user1 = u'tuser1'
user_does_not_exist = u'does_not_exist'
@@ -66,6 +67,7 @@ hostgroup_exclude_regex2 = u'^www5'
hostgroup_exclude_regex3 = u'^webserver5'
+@pytest.mark.tier1
class test_automember(Declarative):
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_automount_plugin.py b/ipatests/test_xmlrpc/test_automount_plugin.py
index dcc79c83c..073dfcf14 100644
--- a/ipatests/test_xmlrpc/test_automount_plugin.py
+++ b/ipatests/test_xmlrpc/test_automount_plugin.py
@@ -25,6 +25,7 @@ import sys
import textwrap
import tempfile
import shutil
+import pytest
from ipalib import api
from ipalib import errors
@@ -115,6 +116,8 @@ class AutomountTest(XMLRPC_test):
# Success; delete the temporary directory
shutil.rmtree(conf_directory)
+
+@pytest.mark.tier1
class test_automount(AutomountTest):
"""
Test the `automount` plugin.
@@ -323,6 +326,7 @@ class test_automount(AutomountTest):
api.Command['automountkey_show'](self.locname, self.mapname, **key_kw)
+@pytest.mark.tier1
class test_automount_direct(AutomountTest):
"""
Test the `automount` plugin indirect map functionality.
@@ -388,6 +392,7 @@ class test_automount_direct(AutomountTest):
self.check_import_roundtrip()
+@pytest.mark.tier1
class test_automount_indirect(AutomountTest):
"""
Test the `automount` plugin indirect map functionality.
@@ -486,6 +491,8 @@ class test_automount_indirect(AutomountTest):
"""
self.check_import_roundtrip()
+
+@pytest.mark.tier1
class test_automount_indirect_no_parent(AutomountTest):
"""
Test the `automount` plugin Indirect map function.
diff --git a/ipatests/test_xmlrpc/test_baseldap_plugin.py b/ipatests/test_xmlrpc/test_baseldap_plugin.py
index 477772c00..6764b1051 100644
--- a/ipatests/test_xmlrpc/test_baseldap_plugin.py
+++ b/ipatests/test_xmlrpc/test_baseldap_plugin.py
@@ -28,8 +28,10 @@ from ipapython import ipaldap
from ipalib import errors
from ipalib.plugins import baseldap
from ipatests.util import assert_deepequal
+import pytest
+@pytest.mark.tier0
def test_exc_wrapper():
"""Test the CallbackInterface._exc_wrapper helper method"""
handled_exceptions = []
@@ -73,6 +75,7 @@ def test_exc_wrapper():
assert handled_exceptions == [None, errors.ExecutionError]
+@pytest.mark.tier0
def test_callback_registration():
class callbacktest_base(baseldap.CallbackInterface):
_callback_registry = dict(test={})
@@ -117,6 +120,7 @@ def test_callback_registration():
('Subclass registered callback', 42)]
+@pytest.mark.tier0
def test_exc_callback_registration():
messages = []
class callbacktest_base(baseldap.BaseLDAPCommand):
@@ -169,6 +173,7 @@ def test_exc_callback_registration():
assert messages == ['Base exc_callback', 'Subclass registered callback']
+@pytest.mark.tier0
def test_entry_to_dict():
class FakeAttributeType(object):
def __init__(self, name, syntax):
diff --git a/ipatests/test_xmlrpc/test_batch_plugin.py b/ipatests/test_xmlrpc/test_batch_plugin.py
index 1cfeb53bb..ca042d347 100644
--- a/ipatests/test_xmlrpc/test_batch_plugin.py
+++ b/ipatests/test_xmlrpc/test_batch_plugin.py
@@ -27,6 +27,7 @@ from ipatests.util import assert_equal, Fuzzy, assert_deepequal
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
from ipapython.dn import DN
+import pytest
group1 = u'testgroup1'
first1 = u'John'
@@ -48,6 +49,7 @@ def deepequal_list(*expected):
return checker
+@pytest.mark.tier1
class test_batch(Declarative):
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_caacl_plugin.py b/ipatests/test_xmlrpc/test_caacl_plugin.py
index 33268d6dd..8b156a65a 100644
--- a/ipatests/test_xmlrpc/test_caacl_plugin.py
+++ b/ipatests/test_xmlrpc/test_caacl_plugin.py
@@ -414,11 +414,13 @@ def staged_user(request):
return tracker.make_fixture(request)
+@pytest.mark.tier0
class TestDefaultACL(XMLRPC_test):
def test_default_acl_present(self, default_acl):
default_acl.retrieve()
+@pytest.mark.tier1
class TestCAACLbasicCRUD(XMLRPC_test):
def test_create(self, crud_acl):
crud_acl.create()
@@ -447,6 +449,7 @@ class TestCAACLbasicCRUD(XMLRPC_test):
crud_acl.find()
+@pytest.mark.tier1
class TestCAACLMembers(XMLRPC_test):
def test_category_member_exclusivity(self, category_acl, default_profile):
category_acl.create()
diff --git a/ipatests/test_xmlrpc/test_caacl_profile_enforcement.py b/ipatests/test_xmlrpc/test_caacl_profile_enforcement.py
index e9472b078..78262ae8c 100644
--- a/ipatests/test_xmlrpc/test_caacl_profile_enforcement.py
+++ b/ipatests/test_xmlrpc/test_caacl_profile_enforcement.py
@@ -100,6 +100,7 @@ def smime_group(request):
return u'smime_users'
+@pytest.mark.tier1
class TestCertSignMIME(XMLRPC_test):
def test_cert_import(self, smime_profile):
@@ -125,6 +126,7 @@ class TestCertSignMIME(XMLRPC_test):
profile_id=smime_profile.name)
+@pytest.mark.tier1
class TestSignWithDisabledACL(XMLRPC_test):
def test_import_profile_and_acl(self, smime_profile, smime_acl):
@@ -162,6 +164,7 @@ class TestSignWithDisabledACL(XMLRPC_test):
principal=smime_user)
+@pytest.mark.tier1
class TestSignWithoutGroupMembership(XMLRPC_test):
def test_import_profile_and_acl(self, smime_profile, smime_acl):
@@ -197,6 +200,7 @@ class TestSignWithoutGroupMembership(XMLRPC_test):
principal=smime_user)
+@pytest.mark.tier1
class TestSignWithChangedProfile(XMLRPC_test):
""" Test to verify that the updated profile is used.
diff --git a/ipatests/test_xmlrpc/test_cert_plugin.py b/ipatests/test_xmlrpc/test_cert_plugin.py
index a593db7f9..f54a226e4 100644
--- a/ipatests/test_xmlrpc/test_cert_plugin.py
+++ b/ipatests/test_xmlrpc/test_cert_plugin.py
@@ -36,6 +36,7 @@ import nose
import base64
from ipaplatform.paths import paths
from ipapython.dn import DN
+import pytest
if six.PY3:
unicode = str
@@ -71,6 +72,8 @@ def is_db_configured():
# The API tested depends on the value of ~/.ipa/default/ra_plugin when
# running as the lite-server.
+
+@pytest.mark.tier1
class test_cert(XMLRPC_test):
@classmethod
@@ -203,6 +206,8 @@ class test_cert(XMLRPC_test):
res = api.Command['service_find'](self.service_princ)
assert res['count'] == 0
+
+@pytest.mark.tier1
class test_cert_find(XMLRPC_test):
@classmethod
diff --git a/ipatests/test_xmlrpc/test_certprofile_plugin.py b/ipatests/test_xmlrpc/test_certprofile_plugin.py
index 2875cfe11..1f06f99f5 100644
--- a/ipatests/test_xmlrpc/test_certprofile_plugin.py
+++ b/ipatests/test_xmlrpc/test_certprofile_plugin.py
@@ -221,6 +221,7 @@ def xmlprofile(request):
return tracker
+@pytest.mark.tier0
class TestDefaultProfile(XMLRPC_test):
def test_default_profile_present(self, default_profile):
default_profile.retrieve()
@@ -243,6 +244,7 @@ class TestDefaultProfile(XMLRPC_test):
command()
+@pytest.mark.tier1
class TestProfileCRUD(XMLRPC_test):
def test_create_duplicate(self, user_profile):
msg = u'Certificate Profile with name "{}" already exists'
@@ -329,12 +331,14 @@ class TestProfileCRUD(XMLRPC_test):
command()
+@pytest.mark.tier1
class TestMalformedProfile(XMLRPC_test):
def test_malformed_import(self, malformed):
with pytest.raises(errors.ExecutionError):
malformed.create()
+@pytest.mark.tier1
class TestImportFromXML(XMLRPC_test):
def test_import_xml(self, xmlprofile):
with pytest.raises(errors.ExecutionError):
diff --git a/ipatests/test_xmlrpc/test_config_plugin.py b/ipatests/test_xmlrpc/test_config_plugin.py
index ec31f1305..291b86a7e 100644
--- a/ipatests/test_xmlrpc/test_config_plugin.py
+++ b/ipatests/test_xmlrpc/test_config_plugin.py
@@ -24,7 +24,10 @@ Test the `ipalib/plugins/config.py` module.
from ipalib import errors
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
+import pytest
+
+@pytest.mark.tier1
class test_config(Declarative):
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_delegation_plugin.py b/ipatests/test_xmlrpc/test_delegation_plugin.py
index 3ce7bafb4..119822983 100644
--- a/ipatests/test_xmlrpc/test_delegation_plugin.py
+++ b/ipatests/test_xmlrpc/test_delegation_plugin.py
@@ -26,10 +26,13 @@ from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
from ipapython.dn import DN
+import pytest
delegation1 = u'testdelegation'
member1 = u'admins'
+
+@pytest.mark.tier1
class test_delegation(Declarative):
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_dns_plugin.py b/ipatests/test_xmlrpc/test_dns_plugin.py
index e5d1374d0..4d3117f17 100644
--- a/ipatests/test_xmlrpc/test_dns_plugin.py
+++ b/ipatests/test_xmlrpc/test_dns_plugin.py
@@ -28,6 +28,7 @@ from ipapython.dn import DN
from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
+import pytest
try:
from ipaserver.plugins.ldap2 import ldap2
@@ -420,6 +421,7 @@ if have_ldap2:
get_nameservers_error = "No DNS servers found in LDAP"
+@pytest.mark.tier1
class test_dns(Declarative):
@classmethod
@@ -3090,6 +3092,7 @@ class test_dns(Declarative):
]
+@pytest.mark.tier1
class test_root_zone(Declarative):
@classmethod
@@ -3170,6 +3173,7 @@ class test_root_zone(Declarative):
]
+@pytest.mark.tier1
class test_forward_zones(Declarative):
# https://fedorahosted.org/freeipa/ticket/4750
@@ -4374,6 +4378,7 @@ class test_forward_zones(Declarative):
]
+@pytest.mark.tier1
class test_forward_master_zones_mutual_exlusion(Declarative):
# https://fedorahosted.org/freeipa/ticket/4750
@@ -4749,6 +4754,7 @@ class test_forward_master_zones_mutual_exlusion(Declarative):
]
+@pytest.mark.tier1
class test_forwardzone_delegation_warnings(Declarative):
@classmethod
@@ -5204,6 +5210,7 @@ class test_forwardzone_delegation_warnings(Declarative):
# https://fedorahosted.org/freeipa/ticket/4746
# http://www.freeipa.org/page/V4/DNS:_Automatic_Zone_NS/SOA_Record_Maintenance
+@pytest.mark.tier1
class test_dns_soa(Declarative):
@classmethod
diff --git a/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py b/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py
index 76d4a600b..f284e1317 100644
--- a/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py
+++ b/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py
@@ -30,6 +30,7 @@ from ipapython.dn import DN
from ipapython.dnsutil import DNSName
from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_digits
+import pytest
if six.PY3:
unicode = str
@@ -88,6 +89,7 @@ def assert_realmdomain_and_txt_record_not_present(response):
return True
+@pytest.mark.tier1
class test_dns_realmdomains_integration(Declarative):
cleanup_commands = [
('realmdomains_mod', [], {'associateddomain': [our_domain]}),
diff --git a/ipatests/test_xmlrpc/test_external_members.py b/ipatests/test_xmlrpc/test_external_members.py
index d78ee216b..8e9d38729 100644
--- a/ipatests/test_xmlrpc/test_external_members.py
+++ b/ipatests/test_xmlrpc/test_external_members.py
@@ -27,6 +27,7 @@ from ipapython.dn import DN
from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_uuid,
fuzzy_user_or_group_sid)
+import pytest
group_name = u'external_group'
group_desc = u'Test external group'
@@ -42,6 +43,7 @@ def get_trusted_group_name():
return u'%s\Domain Admins' % ad_netbios
+@pytest.mark.tier1
class test_external_members(Declarative):
@classmethod
def setup_class(cls):
diff --git a/ipatests/test_xmlrpc/test_group_plugin.py b/ipatests/test_xmlrpc/test_group_plugin.py
index d668b399e..ed38c696e 100644
--- a/ipatests/test_xmlrpc/test_group_plugin.py
+++ b/ipatests/test_xmlrpc/test_group_plugin.py
@@ -53,6 +53,8 @@ external_sid1=u'S-1-1-123456-789-1'
def get_group_dn(cn):
return DN(('cn', cn), api.env.container_group, api.env.basedn)
+
+@pytest.mark.tier1
class test_group(Declarative):
cleanup_commands = [
('group_del', [group1], {}),
@@ -1019,6 +1021,8 @@ class test_group(Declarative):
),
]
+
+@pytest.mark.tier1
class test_group_remove_group_from_protected_group(Declarative):
cleanup_commands = [
('group_del', [group1], {}),
@@ -1087,6 +1091,8 @@ class test_group_remove_group_from_protected_group(Declarative):
),
]
+
+@pytest.mark.tier1
class test_group_full_set_of_objectclass_not_available_post_detach(Declarative):
# https://fedorahosted.org/freeipa/ticket/4909#comment:1
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_hbac_plugin.py b/ipatests/test_xmlrpc/test_hbac_plugin.py
index a9677bfde..5412591d2 100644
--- a/ipatests/test_xmlrpc/test_hbac_plugin.py
+++ b/ipatests/test_xmlrpc/test_hbac_plugin.py
@@ -25,7 +25,10 @@ from nose.tools import raises, assert_raises # pylint: disable=E0611
from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
from ipalib import api
from ipalib import errors
+import pytest
+
+@pytest.mark.tier1
class test_hbac(XMLRPC_test):
"""
Test the `hbacrule` plugin.
diff --git a/ipatests/test_xmlrpc/test_hbacsvcgroup_plugin.py b/ipatests/test_xmlrpc/test_hbacsvcgroup_plugin.py
index 3aaaa36fb..182a76bf9 100644
--- a/ipatests/test_xmlrpc/test_hbacsvcgroup_plugin.py
+++ b/ipatests/test_xmlrpc/test_hbacsvcgroup_plugin.py
@@ -25,6 +25,7 @@ from ipalib import api, errors
from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_uuid
from ipatests.test_xmlrpc import objectclasses
from ipapython.dn import DN
+import pytest
hbacsvcgroup1 = u'testhbacsvcgroup1'
dn1 = DN(('cn',hbacsvcgroup1),('cn','hbacservicegroups'),('cn','hbac'),
@@ -35,6 +36,7 @@ hbacsvc_dn1 = DN(('cn',hbacsvc1),('cn','hbacservices'),('cn','hbac'),
api.env.basedn)
+@pytest.mark.tier1
class test_hbacsvcgroup(Declarative):
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_hbactest_plugin.py b/ipatests/test_xmlrpc/test_hbactest_plugin.py
index fc6a4118f..9b631a4b5 100644
--- a/ipatests/test_xmlrpc/test_hbactest_plugin.py
+++ b/ipatests/test_xmlrpc/test_hbactest_plugin.py
@@ -25,12 +25,16 @@ from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
from ipalib import api
from ipalib import errors
from nose.tools import raises
+import pytest
# Test strategy:
# 1. Create few allow rules: with user categories, with explicit users, with user groups, with groups, with services
# 2. Create users for test
# 3. Run detailed and non-detailed tests for explicitly specified rules, check expected result
#
+
+
+@pytest.mark.tier1
class test_hbactest(XMLRPC_test):
"""
Test the `hbactest` plugin.
diff --git a/ipatests/test_xmlrpc/test_host_plugin.py b/ipatests/test_xmlrpc/test_host_plugin.py
index bba86492e..868c09ce8 100644
--- a/ipatests/test_xmlrpc/test_host_plugin.py
+++ b/ipatests/test_xmlrpc/test_host_plugin.py
@@ -318,6 +318,7 @@ def ipv6_fromip_host(request):
return tracker.make_fixture(request)
+@pytest.mark.tier1
class TestNonexistentHost(XMLRPC_test):
def test_retrieve_nonexistent(self, host):
host.ensure_missing()
@@ -341,6 +342,7 @@ class TestNonexistentHost(XMLRPC_test):
command()
+@pytest.mark.tier1
class TestCRUD(XMLRPC_test):
def test_create_duplicate(self, host):
host.ensure_exists()
@@ -461,6 +463,7 @@ class TestCRUD(XMLRPC_test):
host.check_create(result)
+@pytest.mark.tier1
class TestMultipleMatches(XMLRPC_test):
def test_try_show_multiple_matches_with_shortname(self, host, lab_host):
host.ensure_exists()
@@ -471,6 +474,7 @@ class TestMultipleMatches(XMLRPC_test):
command()
+@pytest.mark.tier1
class TestHostWithService(XMLRPC_test):
"""Test deletion using a non-fully-qualified hostname.
Services associated with this host should also be removed.
@@ -516,6 +520,7 @@ class TestHostWithService(XMLRPC_test):
pass
+@pytest.mark.tier1
class TestManagedHosts(XMLRPC_test):
def test_managed_hosts(self, host, host2, host3):
host.ensure_exists()
@@ -580,6 +585,7 @@ class TestManagedHosts(XMLRPC_test):
), result)
+@pytest.mark.tier1
class TestProtectedMaster(XMLRPC_test):
def test_try_delete_master(self, this_host):
command = this_host.make_delete_command()
@@ -596,6 +602,7 @@ class TestProtectedMaster(XMLRPC_test):
command()
+@pytest.mark.tier1
class TestValidation(XMLRPC_test):
def test_try_validate_create(self, invalid_host):
command = invalid_host.make_create_command()
@@ -647,6 +654,7 @@ def keytabname(request):
os.unlink(keytabname)
+@pytest.mark.tier1
class TestHostFalsePwdChange(XMLRPC_test):
def test_join_host(self, host, keytabname):
@@ -732,6 +740,7 @@ def dns_setup(host):
pass
+@pytest.mark.tier1
class TestHostDNS(XMLRPC_test):
def test_add_ipv6only_host(self, dns_setup, ipv6only_host):
ipv6only_host.run_command('dnsrecord_add', dnszone,
@@ -858,6 +867,7 @@ def allowedto_context(request, host3):
description=u'Test hostgroup 1')
+@pytest.mark.tier1
class TestHostAllowedTo(XMLRPC_test):
def test_user_allow_retrieve_keytab(self, allowedto_context, host):
diff --git a/ipatests/test_xmlrpc/test_hostgroup_plugin.py b/ipatests/test_xmlrpc/test_hostgroup_plugin.py
index 017d8ad2d..58665f466 100644
--- a/ipatests/test_xmlrpc/test_hostgroup_plugin.py
+++ b/ipatests/test_xmlrpc/test_hostgroup_plugin.py
@@ -26,6 +26,7 @@ from ipalib import api, errors
from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_uuid
from ipatests.test_xmlrpc import objectclasses
from ipapython.dn import DN
+import pytest
hostgroup1 = u'testhostgroup1'
dn1 = DN(('cn',hostgroup1),('cn','hostgroups'),('cn','accounts'),
@@ -42,6 +43,7 @@ host_dn1 = DN(('fqdn',fqdn1),('cn','computers'),('cn','accounts'),
invalidhostgroup1 = u'@invalid'
+@pytest.mark.tier1
class test_hostgroup(Declarative):
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_idviews_plugin.py b/ipatests/test_xmlrpc/test_idviews_plugin.py
index 287555881..205b0fc0e 100644
--- a/ipatests/test_xmlrpc/test_idviews_plugin.py
+++ b/ipatests/test_xmlrpc/test_idviews_plugin.py
@@ -33,6 +33,7 @@ from ipatests.test_xmlrpc.test_user_plugin import get_user_result
from ipatests.test_xmlrpc.test_group_plugin import get_group_dn
from ipatests.util import Fuzzy
from ipapython.dn import DN
+import pytest
if six.PY3:
unicode = str
@@ -122,6 +123,7 @@ def get_hostgroup_netgroup_dn(hostgroup):
api.env.basedn)
+@pytest.mark.tier1
class test_idviews(Declarative):
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_krbtpolicy.py b/ipatests/test_xmlrpc/test_krbtpolicy.py
index 84ca17f82..aab7b7820 100644
--- a/ipatests/test_xmlrpc/test_krbtpolicy.py
+++ b/ipatests/test_xmlrpc/test_krbtpolicy.py
@@ -24,9 +24,12 @@ from ipalib import api, errors
from ipatests.test_xmlrpc.xmlrpc_test import Declarative
from ipapython.dn import DN
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
+import pytest
user1 = u'tuser1'
+
+@pytest.mark.tier1
class test_krbtpolicy(Declarative):
cleanup_commands = [
('user_del', [user1], {}),
@@ -100,7 +103,7 @@ class test_krbtpolicy(Declarative):
dict(
- desc='Update user ticket policy',
+ desc='Update user ticket policy',
command=(
'krbtpolicy_mod', [user1], dict(krbmaxticketlife=3600)
),
diff --git a/ipatests/test_xmlrpc/test_nesting.py b/ipatests/test_xmlrpc/test_nesting.py
index 88ff6a18b..c3bf1ce84 100644
--- a/ipatests/test_xmlrpc/test_nesting.py
+++ b/ipatests/test_xmlrpc/test_nesting.py
@@ -26,6 +26,7 @@ from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
from ipapython.dn import DN
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
+import pytest
group1 = u'testgroup1'
group2 = u'testgroup2'
@@ -48,6 +49,7 @@ host_dn1 = DN(('fqdn',fqdn1),('cn','computers'),('cn','accounts'),
api.env.basedn)
+@pytest.mark.tier1
class test_nesting(Declarative):
cleanup_commands = [
('group_del', [group1], {}),
diff --git a/ipatests/test_xmlrpc/test_netgroup_plugin.py b/ipatests/test_xmlrpc/test_netgroup_plugin.py
index 10553c21f..611bdf2ff 100644
--- a/ipatests/test_xmlrpc/test_netgroup_plugin.py
+++ b/ipatests/test_xmlrpc/test_netgroup_plugin.py
@@ -31,6 +31,7 @@ from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
from ipatests.test_xmlrpc import objectclasses
from ipapython.dn import DN
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
+import pytest
# Global so we can save the value between tests
netgroup_dn = None
@@ -63,6 +64,8 @@ invalidnisdomain1=u'domain1,domain2'
invalidnisdomain2=u'+invalidnisdomain'
invalidhost=u'+invalid&host'
+
+@pytest.mark.tier1
class test_netgroup(Declarative):
"""
Test the `netgroup` plugin.
diff --git a/ipatests/test_xmlrpc/test_old_permission_plugin.py b/ipatests/test_xmlrpc/test_old_permission_plugin.py
index 87a3e8b54..c7c300446 100644
--- a/ipatests/test_xmlrpc/test_old_permission_plugin.py
+++ b/ipatests/test_xmlrpc/test_old_permission_plugin.py
@@ -30,6 +30,7 @@ from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
from ipapython.dn import DN
+import pytest
permission1 = u'testperm'
permission1_dn = DN(('cn',permission1),
@@ -91,6 +92,8 @@ users_dn = DN(api.env.container_user, api.env.basedn)
groups_dn = DN(api.env.container_group, api.env.basedn)
hbac_dn = DN(api.env.container_hbac, api.env.basedn)
+
+@pytest.mark.tier1
class test_old_permission(Declarative):
default_version = u'2.65'
diff --git a/ipatests/test_xmlrpc/test_passwd_plugin.py b/ipatests/test_xmlrpc/test_passwd_plugin.py
index 916dd9e12..2945d7040 100644
--- a/ipatests/test_xmlrpc/test_passwd_plugin.py
+++ b/ipatests/test_xmlrpc/test_passwd_plugin.py
@@ -27,8 +27,10 @@ from nose.tools import assert_raises # pylint: disable=E0611
from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
from ipalib import api
from ipalib import errors
+import pytest
+@pytest.mark.tier1
class test_passwd(XMLRPC_test):
"""
Test the `passwd` plugin.
diff --git a/ipatests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py
index b9c8d1b98..d0bee97df 100644
--- a/ipatests/test_xmlrpc/test_permission_plugin.py
+++ b/ipatests/test_xmlrpc/test_permission_plugin.py
@@ -32,6 +32,7 @@ from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import Declarative
from ipapython.dn import DN
import inspect
+import pytest
try:
from ipaserver.plugins.ldap2 import ldap2
@@ -145,6 +146,7 @@ def lineinfo(level):
return '%s:%s' % (filename, lineno)
+@pytest.mark.tier1
class test_permission_negative(Declarative):
"""Make sure invalid operations fail"""
@@ -386,6 +388,7 @@ class test_permission_negative(Declarative):
]
+@pytest.mark.tier1
class test_permission(Declarative):
"""Misc. tests for the permission plugin"""
cleanup_commands = [
@@ -1722,6 +1725,7 @@ class test_permission_rollback(Declarative):
] + _verifications
+@pytest.mark.tier1
class test_permission_sync_attributes(Declarative):
"""Test the effects of setting permission attributes"""
cleanup_commands = [
@@ -2244,6 +2248,7 @@ class test_permission_sync_nice(Declarative):
]
+@pytest.mark.tier1
class test_permission_targetfilter(Declarative):
"""Test the targetfilter options on permissions"""
cleanup_commands = [
@@ -2807,6 +2812,7 @@ def _make_permission_flag_tests(flags, expected_message):
]
+@pytest.mark.tier1
class test_permission_flags(Declarative):
"""Test that permission flags are handled correctly"""
cleanup_commands = [
@@ -2852,6 +2858,8 @@ def check_legacy_results(results):
assert len(legacy_permissions) == 9, len(legacy_permissions)
return True
+
+@pytest.mark.tier1
class test_permission_legacy(Declarative):
"""Tests for non-upgraded permissions"""
@@ -2870,6 +2878,7 @@ class test_permission_legacy(Declarative):
]
+@pytest.mark.tier1
class test_permission_bindtype(Declarative):
cleanup_commands = [
('permission_del', [permission1], {'force': True}),
@@ -3159,6 +3168,7 @@ class test_permission_bindtype(Declarative):
]
+@pytest.mark.tier1
class test_managed_permissions(Declarative):
cleanup_commands = [
('permission_del', [permission1], {'force': True}),
@@ -3689,6 +3699,7 @@ class test_managed_permissions(Declarative):
]
+@pytest.mark.tier1
class test_permission_filters(Declarative):
"""Test multi-valued filters, type, memberof"""
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_ping_plugin.py b/ipatests/test_xmlrpc/test_ping_plugin.py
index bdbb91e4f..e1c772ad6 100644
--- a/ipatests/test_xmlrpc/test_ping_plugin.py
+++ b/ipatests/test_xmlrpc/test_ping_plugin.py
@@ -25,8 +25,10 @@ from ipalib import api, errors, messages, _
from ipatests.util import Fuzzy
from ipatests.test_xmlrpc.xmlrpc_test import Declarative
from ipapython.version import API_VERSION
+import pytest
+@pytest.mark.tier1
class test_ping(Declarative):
tests = [
diff --git a/ipatests/test_xmlrpc/test_privilege_plugin.py b/ipatests/test_xmlrpc/test_privilege_plugin.py
index 9b3d50388..148f7d1fe 100644
--- a/ipatests/test_xmlrpc/test_privilege_plugin.py
+++ b/ipatests/test_xmlrpc/test_privilege_plugin.py
@@ -26,6 +26,7 @@ from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
from ipapython.dn import DN
+import pytest
permission1 = u'testperm'
permission1_dn = DN(('cn',permission1),
@@ -42,6 +43,7 @@ privilege1_dn = DN(('cn',privilege1),
users_dn = DN(api.env.container_user, api.env.basedn)
+@pytest.mark.tier1
class test_privilege(Declarative):
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_pwpolicy_plugin.py b/ipatests/test_xmlrpc/test_pwpolicy_plugin.py
index 3739aa893..7cbb9bad4 100644
--- a/ipatests/test_xmlrpc/test_pwpolicy_plugin.py
+++ b/ipatests/test_xmlrpc/test_pwpolicy_plugin.py
@@ -29,7 +29,10 @@ from ipapython.dn import DN
from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import (XMLRPC_test, assert_attr_equal,
Declarative)
+import pytest
+
+@pytest.mark.tier1
class test_pwpolicy(XMLRPC_test):
"""
Test the `pwpolicy` plugin.
@@ -245,6 +248,7 @@ class test_pwpolicy(XMLRPC_test):
api.Command['user_del'](self.user)
+@pytest.mark.tier1
class test_pwpolicy_mod_cospriority(Declarative):
"""Tests for cospriority modifications"""
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_radiusproxy_plugin.py b/ipatests/test_xmlrpc/test_radiusproxy_plugin.py
index 076712777..30df17e7e 100644
--- a/ipatests/test_xmlrpc/test_radiusproxy_plugin.py
+++ b/ipatests/test_xmlrpc/test_radiusproxy_plugin.py
@@ -25,6 +25,7 @@ from ipapython.dn import DN
from ipatests.test_xmlrpc.xmlrpc_test import Declarative
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
from ipatests.test_xmlrpc import objectclasses
+import pytest
if six.PY3:
unicode = str
@@ -36,6 +37,7 @@ user1 = u'tuser1'
password1 = u'very*secure123'
+@pytest.mark.tier1
class test_raduisproxy(Declarative):
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_range_plugin.py b/ipatests/test_xmlrpc/test_range_plugin.py
index 29af35306..30e67ca7c 100644
--- a/ipatests/test_xmlrpc/test_range_plugin.py
+++ b/ipatests/test_xmlrpc/test_range_plugin.py
@@ -29,6 +29,7 @@ from ipatests.test_xmlrpc import objectclasses
from ipatests.util import MockLDAP
from ipapython.dn import DN
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
+import pytest
if six.PY3:
unicode = str
@@ -388,6 +389,7 @@ group1 = u'group1'
group1_gid = id_shift + 900100
+@pytest.mark.tier1
class test_range(Declarative):
@classmethod
def setup_class(cls):
diff --git a/ipatests/test_xmlrpc/test_realmdomains_plugin.py b/ipatests/test_xmlrpc/test_realmdomains_plugin.py
index 5855e7579..cd35729ed 100644
--- a/ipatests/test_xmlrpc/test_realmdomains_plugin.py
+++ b/ipatests/test_xmlrpc/test_realmdomains_plugin.py
@@ -24,6 +24,7 @@ from ipalib import api, errors
from ipapython.dn import DN
from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import Declarative
+import pytest
cn = u'Realm Domains'
@@ -34,6 +35,7 @@ new_domain_2 = u'example2.com'
bad_domain = u'doesnotexist.test'
+@pytest.mark.tier1
class test_realmdomains(Declarative):
# Make sure your environment has sound DNS configuration where
diff --git a/ipatests/test_xmlrpc/test_replace.py b/ipatests/test_xmlrpc/test_replace.py
index 48444b42a..1420e7d87 100644
--- a/ipatests/test_xmlrpc/test_replace.py
+++ b/ipatests/test_xmlrpc/test_replace.py
@@ -27,10 +27,12 @@ gen_modlist code.
from ipatests.test_xmlrpc.xmlrpc_test import Declarative
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
+import pytest
user1=u'tuser1'
+@pytest.mark.tier1
class test_replace(Declarative):
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_role_plugin.py b/ipatests/test_xmlrpc/test_role_plugin.py
index 863cdb112..70b5f6165 100644
--- a/ipatests/test_xmlrpc/test_role_plugin.py
+++ b/ipatests/test_xmlrpc/test_role_plugin.py
@@ -27,6 +27,7 @@ from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
from ipapython.dn import DN
+import pytest
search = u'test-role'
@@ -48,6 +49,8 @@ privilege1 = u'r,w privilege 1'
privilege1_dn = DN(('cn', privilege1), DN(api.env.container_privilege),
api.env.basedn)
+
+@pytest.mark.tier1
class test_role(Declarative):
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_selfservice_plugin.py b/ipatests/test_xmlrpc/test_selfservice_plugin.py
index 1f6ebb7fb..eed1a2d7e 100644
--- a/ipatests/test_xmlrpc/test_selfservice_plugin.py
+++ b/ipatests/test_xmlrpc/test_selfservice_plugin.py
@@ -25,10 +25,13 @@ from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
fuzzy_uuid)
+import pytest
selfservice1 = u'testself'
invalid_selfservice1 = u'bad+name'
+
+@pytest.mark.tier1
class test_selfservice(Declarative):
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py b/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py
index d67251621..b8beba6e4 100644
--- a/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py
+++ b/ipatests/test_xmlrpc/test_selinuxusermap_plugin.py
@@ -27,6 +27,7 @@ from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
from ipapython.dn import DN
from ipatests.util import Fuzzy
from ipatests.test_xmlrpc.test_user_plugin import get_user_result
+import pytest
rule1 = u'selinuxrule1'
selinuxuser1 = u'guest_u:s0'
@@ -55,6 +56,7 @@ fuzzy_hbacruledn = Fuzzy(
allow_all_rule_dn = api.Command['hbacrule_show'](u'allow_all')['result']['dn']
+@pytest.mark.tier1
class test_selinuxusermap(Declarative):
cleanup_commands = [
('selinuxusermap_del', [rule1], {}),
diff --git a/ipatests/test_xmlrpc/test_service_plugin.py b/ipatests/test_xmlrpc/test_service_plugin.py
index 78ba60a69..ecc5248a9 100644
--- a/ipatests/test_xmlrpc/test_service_plugin.py
+++ b/ipatests/test_xmlrpc/test_service_plugin.py
@@ -31,6 +31,7 @@ from ipatests.test_xmlrpc.test_user_plugin import (
get_user_result, get_user_dn, get_group_dn)
import base64
from ipapython.dn import DN
+import pytest
fqdn1 = u'testhost1.%s' % api.env.domain
fqdn2 = u'testhost2.%s' % api.env.domain
@@ -60,6 +61,8 @@ hostgroup1 = u'testhostgroup1'
hostgroup1_dn = DN(('cn',hostgroup1),('cn','hostgroups'),('cn','accounts'),
api.env.basedn)
+
+@pytest.mark.tier1
class test_service(Declarative):
cleanup_commands = [
@@ -648,6 +651,7 @@ class test_service(Declarative):
]
+@pytest.mark.tier1
class test_service_in_role(Declarative):
cleanup_commands = [
('host_del', [fqdn1], {}),
@@ -771,6 +775,7 @@ class test_service_in_role(Declarative):
]
+@pytest.mark.tier1
class test_service_allowed_to(Declarative):
cleanup_commands = [
('user_del', [user1], {}),
diff --git a/ipatests/test_xmlrpc/test_servicedelegation_plugin.py b/ipatests/test_xmlrpc/test_servicedelegation_plugin.py
index 0eb4b9853..02dc0800f 100644
--- a/ipatests/test_xmlrpc/test_servicedelegation_plugin.py
+++ b/ipatests/test_xmlrpc/test_servicedelegation_plugin.py
@@ -9,6 +9,7 @@ from ipalib import api, errors
from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import Declarative
from ipapython.dn import DN
+import pytest
rule1 = u'test1'
rule2 = u'test rule two'
@@ -22,6 +23,7 @@ def get_servicedelegation_dn(cn):
return DN(('cn', cn), api.env.container_s4u2proxy, api.env.basedn)
+@pytest.mark.tier1
class test_servicedelegation(Declarative):
cleanup_commands = [
('servicedelegationrule_del', [rule1], {}),
diff --git a/ipatests/test_xmlrpc/test_stageuser_plugin.py b/ipatests/test_xmlrpc/test_stageuser_plugin.py
index b09ef6e84..43c59b7c7 100644
--- a/ipatests/test_xmlrpc/test_stageuser_plugin.py
+++ b/ipatests/test_xmlrpc/test_stageuser_plugin.py
@@ -389,6 +389,7 @@ def user7(request):
return tracker.make_fixture_restore(request)
+@pytest.mark.tier1
class TestNonexistentStagedUser(XMLRPC_test):
def test_retrieve_nonexistent(self, stageduser):
stageduser.ensure_missing()
@@ -426,6 +427,7 @@ class TestNonexistentStagedUser(XMLRPC_test):
command()
+@pytest.mark.tier1
class TestStagedUser(XMLRPC_test):
def test_create_duplicate(self, stageduser):
stageduser.ensure_exists()
@@ -518,6 +520,7 @@ class TestStagedUser(XMLRPC_test):
stageduser.retrieve()
+@pytest.mark.tier1
class TestCreateInvalidAttributes(XMLRPC_test):
def test_create_invalid_uid(self):
invalid = StageUserTracker(invaliduser1, u'invalid', u'user')
@@ -586,6 +589,7 @@ class TestCreateInvalidAttributes(XMLRPC_test):
command()
+@pytest.mark.tier1
class TestUpdateInvalidAttributes(XMLRPC_test):
def test_update_uid_string(self, stageduser):
stageduser.ensure_exists()
@@ -620,6 +624,7 @@ class TestUpdateInvalidAttributes(XMLRPC_test):
command()
+@pytest.mark.tier1
class TestActive(XMLRPC_test):
def test_delete(self, user):
user.ensure_exists()
@@ -659,6 +664,7 @@ class TestActive(XMLRPC_test):
command()
+@pytest.mark.tier1
class TestPreserved(XMLRPC_test):
def test_search_preserved_invalid(self, user):
user.make_preserved_user()
@@ -752,6 +758,7 @@ class TestPreserved(XMLRPC_test):
stageduser.delete()
+@pytest.mark.tier1
class TestManagers(XMLRPC_test):
def test_staged_manager(self, user, stageduser):
user.ensure_exists()
@@ -795,6 +802,7 @@ class TestManagers(XMLRPC_test):
assert False
+@pytest.mark.tier1
class TestDuplicates(XMLRPC_test):
def test_active_same_as_preserved(self, user4, user5):
user4.ensure_missing()
@@ -851,6 +859,7 @@ def group(request):
return tracker.make_fixture(request)
+@pytest.mark.tier1
class TestGroups(XMLRPC_test):
def test_stageduser_membership(self, stageduser, group):
stageduser.ensure_exists()
diff --git a/ipatests/test_xmlrpc/test_sudocmd_plugin.py b/ipatests/test_xmlrpc/test_sudocmd_plugin.py
index 2bcf4920f..2056118ba 100644
--- a/ipatests/test_xmlrpc/test_sudocmd_plugin.py
+++ b/ipatests/test_xmlrpc/test_sudocmd_plugin.py
@@ -25,6 +25,7 @@ from ipalib import errors
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_sudocmddn,
fuzzy_uuid)
from ipatests.test_xmlrpc import objectclasses
+import pytest
sudocmd1 = u'/usr/bin/sudotestcmd1'
sudocmd1_camelcase = u'/usr/bin/sudoTestCmd1'
@@ -32,6 +33,7 @@ sudocmd1_camelcase = u'/usr/bin/sudoTestCmd1'
sudorule1 = u'test_sudorule1'
+@pytest.mark.tier1
class test_sudocmd(Declarative):
cleanup_commands = [
diff --git a/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py b/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
index 18980d777..c72ba2f7a 100644
--- a/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
+++ b/ipatests/test_xmlrpc/test_sudocmdgroup_plugin.py
@@ -25,6 +25,7 @@ from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_uuid,
fuzzy_sudocmddn)
from ipapython.dn import DN
+import pytest
sudocmdgroup1 = u'testsudocmdgroup1'
sudocmdgroup2 = u'testsudocmdgroup2'
@@ -51,6 +52,8 @@ def create_command(sudocmd):
),
)
+
+@pytest.mark.tier1
class test_sudocmdgroup(Declarative):
cleanup_commands = [
('sudocmdgroup_del', [sudocmdgroup1], {}),
diff --git a/ipatests/test_xmlrpc/test_sudorule_plugin.py b/ipatests/test_xmlrpc/test_sudorule_plugin.py
index 7d8735c49..ef21f28b4 100644
--- a/ipatests/test_xmlrpc/test_sudorule_plugin.py
+++ b/ipatests/test_xmlrpc/test_sudorule_plugin.py
@@ -27,11 +27,13 @@ import six
from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
from ipalib import api
from ipalib import errors
+import pytest
if six.PY3:
unicode = str
+@pytest.mark.tier1
class test_sudorule(XMLRPC_test):
"""
Test the `sudorule` plugin.
diff --git a/ipatests/test_xmlrpc/test_trust_plugin.py b/ipatests/test_xmlrpc/test_trust_plugin.py
index b5f53a78d..54ac96737 100644
--- a/ipatests/test_xmlrpc/test_trust_plugin.py
+++ b/ipatests/test_xmlrpc/test_trust_plugin.py
@@ -29,6 +29,7 @@ from ipatests.test_xmlrpc import objectclasses
from ipatests.test_xmlrpc.xmlrpc_test import (
Declarative, fuzzy_guid, fuzzy_domain_sid, fuzzy_string, fuzzy_uuid,
fuzzy_digits)
+import pytest
if six.PY3:
unicode = str
@@ -42,6 +43,8 @@ testgroup_dn = DN(('cn', testgroup), api.env.container_group, api.env.basedn)
default_group = u'Default SMB Group'
default_group_dn = DN(('cn', default_group), api.env.container_group, api.env.basedn)
+
+@pytest.mark.tier1
class test_trustconfig(Declarative):
@classmethod
diff --git a/ipatests/test_xmlrpc/test_user_plugin.py b/ipatests/test_xmlrpc/test_user_plugin.py
index 3d7b5e6ba..81185e449 100644
--- a/ipatests/test_xmlrpc/test_user_plugin.py
+++ b/ipatests/test_xmlrpc/test_user_plugin.py
@@ -37,6 +37,7 @@ from xmlrpc_test import (
fuzzy_string, fuzzy_dergeneralizedtime, add_sid, add_oc, raises_exact)
from ipapython.dn import DN
from ipatests.test_xmlrpc.ldaptracker import Tracker
+import pytest
user1 = u'tuser1'
user2 = u'tuser2'
@@ -181,6 +182,7 @@ def not_upg_check(response):
return True
+@pytest.mark.tier1
class test_user(Declarative):
cleanup_commands = [
@@ -1608,6 +1610,7 @@ class test_user(Declarative):
]
+@pytest.mark.tier1
class test_denied_bind_with_expired_principal(XMLRPC_test):
password = u'random'
diff --git a/ipatests/test_xmlrpc/test_vault_plugin.py b/ipatests/test_xmlrpc/test_vault_plugin.py
index 6992005b8..5a0acb170 100644
--- a/ipatests/test_xmlrpc/test_vault_plugin.py
+++ b/ipatests/test_xmlrpc/test_vault_plugin.py
@@ -24,6 +24,7 @@ Test the `ipalib/plugins/vault.py` module.
import nose
from ipalib import api, errors
from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_string
+import pytest
vault_name = u'test_vault'
service_name = u'HTTP/server.example.com'
@@ -124,6 +125,7 @@ veCYju6ok4ZWnMiH8MR1jgC39RWtjJZwynCuPXUP2/vZkoVf1tCZyz7dSm8TdS/2
"""
+@pytest.mark.tier1
class test_vault_plugin(Declarative):
@classmethod