Issue #50353 - Categorize tests by tiers

Bug Description:
We should have different tiers of tests:
tier0 - basic functionality (installation, instance startup, basic operations, import/export, etc.)
tier1 - functional tests for the most used features
tier2 - functional tests for the less used features and tests that take more time to complete (stress tests)
tier3 - long duration tests.

Fix Description:
Use pytest marks per test module or individually.

Fixes https://pagure.io/389-ds-base/issue/50353

Reviewed by: spichugi (Thanks!)

dirsrvtests/pytest.ini

@@ -0,0 +1,6 @@
+[pytest]
+markers =
+    tier0: mark a test as part of tier0
+    tier1: mark a test as part of tier1
+    tier2: mark a test as part of tier2
+    tier3: mark a test as part of tier3

dirsrvtests/tests/perf/memberof_test.py

@@ -18,6 +18,8 @@ from lib389._constants import SUFFIX, DN_SCHEMA, DN_DM, DEFAULT_SUFFIX, PASSWORD
     PLUGIN_MANAGED_ENTRY, PLUGIN_AUTOMEMBER, DN_CONFIG_LDBM, HOST_STANDALONE, PORT_STANDALONE
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier3
+
 MEMOF_PLUGIN = ('cn=' + PLUGIN_MEMBER_OF + ',cn=plugins,cn=config')
 MAN_ENTRY_PLUGIN = ('cn=' + PLUGIN_MANAGED_ENTRY + ',cn=plugins,cn=config')
 AUTO_MEM_PLUGIN = ('cn=' + PLUGIN_AUTOMEMBER + ',cn=plugins,cn=config')

dirsrvtests/tests/stress/cos/cos_scale_template_test.py

@@ -20,6 +20,8 @@ from lib389._constants import DEFAULT_SUFFIX
 
 import time
 
+pytestmark = pytest.mark.tier3
+
 # Given this should complete is about 0.005, this is generous.
 # For the final test with 20 templates, about 0.02 is an acceptable time.
 THRESHOLD = 0.05

dirsrvtests/tests/stress/reliabilty/reliab_7_5_test.py

@@ -21,6 +21,8 @@ from lib389.utils import *
 
 from lib389.idm.directorymanager import DirectoryManager
 
+pytestmark = pytest.mark.tier3
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s' +
                               ' - %(message)s')

dirsrvtests/tests/stress/reliabilty/reliab_conn_test.py

@@ -15,6 +15,8 @@ from lib389.idm.directorymanager import DirectoryManager
 from lib389.idm.user import UserAccounts
 from lib389.topologies import topology_st
 
+pytestmark = pytest.mark.tier3
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/stress/replication/mmr_01_4m-2h-4c_test.py

@@ -12,6 +12,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.repltools import ReplTools
 
+pytestmark = pytest.mark.tier3
+
 logging.getLogger(__name__).setLevel(logging.INFO)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/stress/replication/mmr_01_4m_test.py

@@ -12,6 +12,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.repltools import ReplTools
 
+pytestmark = pytest.mark.tier3
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/acl/acivattr_test.py

@@ -17,7 +17,7 @@ from lib389.idm.nscontainer import nsContainer
 from lib389.idm.domain import Domain
 from lib389.idm.role import FilterRoles
 
-
+pytestmark = pytest.mark.tier1
 
 DNBASE = "o=acivattr,{}".format(DEFAULT_SUFFIX)
 ENG_USER = "cn=enguser1,ou=eng,{}".format(DNBASE)

dirsrvtests/tests/suites/acl/acl_deny_test.py

@@ -8,6 +8,8 @@ from lib389.topologies import topology_st as topo
 from lib389.idm.user import UserAccount, UserAccounts, TEST_USER_PROPERTIES
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)

dirsrvtests/tests/suites/acl/acl_test.py

@@ -18,6 +18,8 @@ from lib389.idm.organizationalrole import OrganizationalRole, OrganizationalRole
 from lib389.topologies import topology_m2
 from lib389._constants import SUFFIX, DN_SCHEMA, DN_DM, DEFAULT_SUFFIX, PASSWORD
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/acl/deladd_test.py

@@ -22,6 +22,8 @@ from lib389.idm.domain import Domain
 
 import ldap
 
+pytestmark = pytest.mark.tier1
+
 
 USER_WITH_ACI_DELADD = 'uid=test_user_1000,ou=People,dc=example,dc=com'
 USER_DELADD = 'uid=test_user_1,ou=Accounting,dc=example,dc=com'

dirsrvtests/tests/suites/acl/enhanced_aci_modrnd_test.py

@@ -11,6 +11,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_st
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/acl/globalgroup_part2_test.py

@@ -15,6 +15,7 @@ from lib389.idm.organizationalunit import OrganizationalUnit
 from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 NESTEDGROUP_OU_GLOBAL = "ou=nestedgroup, {}".format(DEFAULT_SUFFIX)
 DEEPUSER_GLOBAL = "uid=DEEPUSER_GLOBAL, {}".format(NESTEDGROUP_OU_GLOBAL)

dirsrvtests/tests/suites/acl/globalgroup_test.py

@@ -15,6 +15,7 @@ from lib389.idm.organizationalunit import OrganizationalUnit
 from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 ACLGROUP_OU_GLOBAL = "ou=ACLGroup,{}".format(DEFAULT_SUFFIX)
 NESTEDGROUP_OU_GLOBAL = "ou=nestedgroup, {}".format(DEFAULT_SUFFIX)

dirsrvtests/tests/suites/acl/keywords_part2_test.py

@@ -23,6 +23,8 @@ from lib389.idm.user import UserAccount
 
 import ldap
 
+pytestmark = pytest.mark.tier1
+
 
 KEYWORDS_OU_KEY = "ou=Keywords,{}".format(DEFAULT_SUFFIX)
 DAYOFWEEK_OU_KEY = "ou=Dayofweek,{}".format(KEYWORDS_OU_KEY)

dirsrvtests/tests/suites/acl/keywords_test.py

@@ -22,6 +22,7 @@ from lib389.idm.user import UserAccount
 
 import ldap
 
+pytestmark = pytest.mark.tier1
 
 KEYWORDS_OU_KEY = "ou=Keywords,{}".format(DEFAULT_SUFFIX)
 DNS_OU_KEY = "ou=DNS,{}".format(KEYWORDS_OU_KEY)

dirsrvtests/tests/suites/acl/misc_test.py

@@ -23,6 +23,7 @@ from lib389.plugins import ACLPlugin
 
 import ldap
 
+pytestmark = pytest.mark.tier1
 
 PEOPLE = "ou=PEOPLE,{}".format(DEFAULT_SUFFIX)
 DYNGROUP = "cn=DYNGROUP,{}".format(PEOPLE)

dirsrvtests/tests/suites/acl/modify_test.py

@@ -17,6 +17,7 @@ from lib389.idm.group import Groups
 from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 CONTAINER_1_DELADD = "ou=Product Development,{}".format(DEFAULT_SUFFIX)
 CONTAINER_2_DELADD = "ou=Accounting,{}".format(DEFAULT_SUFFIX)

dirsrvtests/tests/suites/acl/modrdn_test.py

@@ -15,6 +15,7 @@ from lib389.idm.organizationalunit import OrganizationalUnit, OrganizationalUnit
 from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 CONTAINER_1_DELADD = "ou=Product Development,{}".format(DEFAULT_SUFFIX)
 CONTAINER_2_DELADD = "ou=Accounting,{}".format(DEFAULT_SUFFIX)

dirsrvtests/tests/suites/acl/repeated_ldap_add_test.py

@@ -16,6 +16,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DN_DM, DEFAULT_SUFFIX, PASSWORD, SERVERID_STANDALONE
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/acl/search_real_part2_test.py

@@ -14,6 +14,7 @@ from lib389.idm.organizationalunit import OrganizationalUnits
 from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 CONTAINER_1_DELADD = "ou=Product Development,{}".format(DEFAULT_SUFFIX)
 CONTAINER_2_DELADD = "ou=Accounting,{}".format(DEFAULT_SUFFIX)
@@ -452,4 +453,4 @@ def test_deny_all_access_with_targetfilter_using_presence_search(
 
 if __name__ == "__main__":
     CURRENT_FILE = os.path.realpath(__file__)
-    pytest.main("-s -v %s" % CURRENT_FILE)
+    pytest.main("-s -v %s" % CURRENT_FILE)

dirsrvtests/tests/suites/acl/search_real_part3_test.py

@@ -17,6 +17,7 @@ from lib389.idm.group import Groups
 from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 CONTAINER_1_DELADD = "ou=Product Development,{}".format(DEFAULT_SUFFIX)
 CONTAINER_2_DELADD = "ou=Accounting,{}".format(DEFAULT_SUFFIX)
@@ -465,4 +466,4 @@ def test_groupdnattr_value_is_another_group(topo):
 
 if __name__ == "__main__":
     CURRENT_FILE = os.path.realpath(__file__)
-    pytest.main("-s -v %s" % CURRENT_FILE)
+    pytest.main("-s -v %s" % CURRENT_FILE)

dirsrvtests/tests/suites/acl/search_real_test.py

@@ -16,6 +16,7 @@ from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 from lib389.idm.posixgroup import PosixGroups
 
+pytestmark = pytest.mark.tier1
 
 CONTAINER_1_DELADD = "ou=Product Development,{}".format(DEFAULT_SUFFIX)
 CONTAINER_2_DELADD = "ou=Accounting,{}".format(DEFAULT_SUFFIX)

dirsrvtests/tests/suites/acl/selfdn_permissions_test.py

@@ -19,7 +19,8 @@ log = logging.getLogger(__name__)
 from lib389.utils import *
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.2'), reason="Not implemented")
+pytestmark = [pytest.mark.tier1,
+              pytest.mark.skipif(ds_is_older('1.3.2'), reason="Not implemented")]
 OC_NAME = 'OCticket47653'
 MUST = "(postalAddress $ postalCode)"
 MAY = "(member $ street)"

dirsrvtests/tests/suites/acl/syntax_test.py

@@ -17,6 +17,8 @@ from lib389.topologies import topology_st as topo
 
 import ldap
 
+pytestmark = pytest.mark.tier1
+
 INVALID = [('test_targattrfilters_1',
             f'(targattrfilters ="add=title:title=fred),del=cn:(cn!=harry)")'
             f'(version 3.0; acl "Name of the ACI"; deny absolute (all)userdn="ldap:///anyone";)'),

dirsrvtests/tests/suites/acl/valueacl_part2_test.py

@@ -14,6 +14,7 @@ from lib389.idm.organizationalunit import OrganizationalUnit
 from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 CONTAINER_1_DELADD = "ou=Product Development,{}".format(DEFAULT_SUFFIX)
 CONTAINER_2_DELADD = "ou=Accounting,{}".format(DEFAULT_SUFFIX)
@@ -428,4 +429,4 @@ def test_targattrfilters_keyword(topo):
 
 if __name__ == '__main__':
     CURRENT_FILE = os.path.realpath(__file__)
-    pytest.main("-s -v %s" % CURRENT_FILE)
+    pytest.main("-s -v %s" % CURRENT_FILE)

dirsrvtests/tests/suites/acl/valueacl_test.py

@@ -14,6 +14,7 @@ from lib389.idm.organizationalunit import OrganizationalUnit
 from lib389.topologies import topology_st as topo
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
 
 CONTAINER_1_DELADD = "ou=Product Development,{}".format(DEFAULT_SUFFIX)
 CONTAINER_2_DELADD = "ou=Accounting,{}".format(DEFAULT_SUFFIX)

dirsrvtests/tests/suites/attr_encryption/attr_encryption_test.py

@@ -17,6 +17,8 @@ from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 from lib389.backend import Backends
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
+
 USER_DN = 'uid=test_user,%s' % DEFAULT_SUFFIX
 
 logging.getLogger(__name__).setLevel(logging.INFO)

dirsrvtests/tests/suites/automember_plugin/automember_mod_test.py

@@ -9,7 +9,8 @@ from lib389.idm.group import Groups
 from lib389.topologies import topology_st as topo
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.4.0'), reason="Not implemented")
+pytestmark = [pytest.mark.tier1,
+              pytest.mark.skipif(ds_is_older('1.4.0'), reason="Not implemented")]
 
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:

dirsrvtests/tests/suites/automember_plugin/automember_test.py

@@ -14,7 +14,8 @@ from lib389._constants import DEFAULT_SUFFIX
 
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.7'), reason="Not implemented")
+pytestmark = [pytest.mark.tier1,
+              pytest.mark.skipif(ds_is_older('1.3.7'), reason="Not implemented")]
 
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:

dirsrvtests/tests/suites/basic/basic_test.py

@@ -25,6 +25,7 @@ from lib389.paths import Paths
 from lib389.idm.directorymanager import DirectoryManager
 from lib389.config import LDBMConfig
 
+pytestmark = pytest.mark.tier0
 
 default_paths = Paths()
 

dirsrvtests/tests/suites/betxns/betxn_test.py

@@ -20,6 +20,8 @@ from lib389.idm.organizationalunit import OrganizationalUnits
 from lib389.idm.group import Groups, Group
 from lib389._constants import DEFAULT_SUFFIX
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/clu/clu_test.py

@@ -13,6 +13,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_st
 
+pytestmark = pytest.mark.tier0
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/config/autotuning_test.py

@@ -13,6 +13,8 @@ from lib389.topologies import topology_st as topo
 
 from lib389._constants import DN_CONFIG_LDBM, DN_USERROOT_LDBM, DEFAULT_SUFFIX
 
+pytestmark = pytest.mark.tier0
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)

dirsrvtests/tests/suites/config/config_test.py

@@ -20,6 +20,8 @@ from lib389.cos import CosPointerDefinitions, CosTemplates
 from lib389.backend import Backends
 from lib389.monitor import MonitorLDBM
 
+pytestmark = pytest.mark.tier0
+
 USER_DN = 'uid=test_user,%s' % DEFAULT_SUFFIX
 
 logging.getLogger(__name__).setLevel(logging.INFO)

dirsrvtests/tests/suites/config/regression_test.py

@@ -14,6 +14,8 @@ from lib389.config import LDBMConfig
 from lib389.backend import Backends
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier0
+
 logging.getLogger(__name__).setLevel(logging.INFO)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/config/removed_config_49298_test.py

@@ -13,6 +13,8 @@ import subprocess
 
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier0
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)

dirsrvtests/tests/suites/cos/cos_test.py

@@ -14,6 +14,7 @@ from lib389.idm.role import FilterRoles
 from lib389.idm.nscontainer import nsContainer
 from lib389.idm.user import UserAccount
 
+pytestmark = pytest.mark.tier1
 
 def test_positive(topo):
     """

dirsrvtests/tests/suites/cos/indirect_cos_test.py

@@ -12,6 +12,7 @@ from lib389.topologies import topology_st as topo
 from lib389._constants import (DEFAULT_SUFFIX, DN_DM, PASSWORD, HOST_STANDALONE,
                                SERVERID_STANDALONE, PORT_STANDALONE)
 
+pytestmark = pytest.mark.tier1
 
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:

dirsrvtests/tests/suites/disk_monitoring/disk_monitoring_test.py

@@ -19,6 +19,7 @@ from lib389.topologies import topology_st as topo
 from lib389.paths import *
 from lib389.idm.user import UserAccounts
 
+pytestmark = pytest.mark.tier2
 
 THRESHOLD = '30'
 THRESHOLD_BYTES = '30000000'

dirsrvtests/tests/suites/ds_logs/ds_logs_test.py

@@ -17,6 +17,7 @@ from lib389.idm.user import UserAccounts
 from lib389.idm.group import Groups
 from lib389.idm.organizationalunit import OrganizationalUnits
 
+pytestmark = pytest.mark.tier1
 
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)

dirsrvtests/tests/suites/ds_logs/regression_test.py

@@ -13,6 +13,8 @@ from lib389._constants import DN_CONFIG, LOG_REPLICA, LOG_DEFAULT, LOG_TRACE, LO
 from lib389.utils import os, logging
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier2
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)

dirsrvtests/tests/suites/ds_tools/logpipe_test.py

@@ -11,6 +11,8 @@ import subprocess
 from lib389.utils import *
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)

dirsrvtests/tests/suites/ds_tools/replcheck_test.py

@@ -17,6 +17,8 @@ from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 from lib389.idm.services import ServiceAccounts
 from lib389.topologies import topology_m2 as topo
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)

dirsrvtests/tests/suites/dynamic_plugins/dynamic_plugins_test.py

@@ -23,6 +23,8 @@ from lib389.topologies import topology_m2
 from ..plugins import acceptance_test
 from . import stress_tests
 
+pytestmark = pytest.mark.tier1
+
 log = logging.getLogger(__name__)
 
 

dirsrvtests/tests/suites/dynamic_plugins/stress_tests.py

@@ -15,6 +15,7 @@ import logging
 import threading
 
 import ldap
+import pytest
 from lib389 import Entry
 from lib389._constants import *
 from lib389.properties import *
@@ -22,6 +23,8 @@ from lib389.plugins import ReferentialIntegrityPlugin, MemberOfPlugin
 from lib389.utils import *
 from lib389.idm.directorymanager import *
 
+pytestmark = pytest.mark.tier2
+
 log = logging.getLogger(__name__)
 
 NUM_USERS = 250

dirsrvtests/tests/suites/filter/basic_filter_test.py

@@ -14,6 +14,7 @@ from lib389.topologies import topology_st as topo
 from lib389.idm.user import UserAccount, UserAccounts
 from lib389.idm.account import Accounts
 
+pytestmark = pytest.mark.tier0
 
 def test_search_attr(topo):
     """

dirsrvtests/tests/suites/filter/complex_filters_test.py

@@ -6,6 +6,8 @@ from lib389._constants import *
 from lib389.topologies import topology_st as topo
 from lib389.idm.user import UserAccounts
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)

dirsrvtests/tests/suites/filter/filter_logic_test.py

@@ -15,6 +15,8 @@ from lib389._constants import DEFAULT_SUFFIX
 
 from lib389.idm.user import UserAccounts
 
+pytestmark = pytest.mark.tier1
+
 """
 This test case asserts that various logical filters apply correctly and as expected.
 This is to assert that we have correct and working search operations, especially related

dirsrvtests/tests/suites/filter/filter_test.py

@@ -14,6 +14,8 @@ from lib389.topologies import topology_st
 from lib389._constants import PASSWORD, DEFAULT_SUFFIX, DN_DM, SUFFIX
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/filter/rfc3673_all_oper_attrs_test.py

@@ -14,6 +14,8 @@ from lib389.idm.user import UserAccounts
 
 from lib389._constants import DN_DM, DEFAULT_SUFFIX, DN_CONFIG, PASSWORD
 
+pytestmark = pytest.mark.tier1
+
 DN_PEOPLE = 'ou=people,%s' % DEFAULT_SUFFIX
 DN_ROOT = ''
 TEST_USER_NAME = 'all_attrs_test'

dirsrvtests/tests/suites/fourwaymmr/fourwaymmr_test.py

@@ -15,6 +15,7 @@ from lib389.replica import *
 from lib389.idm.user import UserAccounts
 from lib389.agreement import *
 
+pytestmark = pytest.mark.tier2
 
 @pytest.fixture(scope="function")
 def _cleanupentris(request, topo_m4):

dirsrvtests/tests/suites/get_effective_rights/acceptance_test.py

@@ -8,6 +8,8 @@ from lib389.topologies import topology_st as topo
 from lib389._constants import *
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier1
+
 TEST_ENTRY_NAME = 'testuser'
 TEST_GROUP_NAME = 'group1'
 TEST_GROUP2_NAME = 'group1'

dirsrvtests/tests/suites/gssapi/simple_gssapi_test.py

@@ -18,7 +18,7 @@ import subprocess
 import os
 import pytest
 
-
+pytestmark = pytest.mark.tier1
 
 @pytest.fixture(scope='module')
 def testuser(topology_st_gssapi):

dirsrvtests/tests/suites/gssapi_repl/gssapi_repl_test.py

@@ -11,6 +11,8 @@ from lib389.tasks import *
 from lib389.utils import *
 from lib389.topologies import topology_m2
 
+pytestmark = pytest.mark.tier2
+
 #########################################
 #
 # WARNING!!!!! If this test is failing, and your here to find out why, the

dirsrvtests/tests/suites/import/regression_test.py

@@ -14,6 +14,8 @@ from lib389._constants import BACKEND_NAME, BACKEND_SUFFIX
 
 from lib389.dbgen import dbgen
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)

dirsrvtests/tests/suites/lib389/config_compare_test.py

@@ -4,6 +4,8 @@ import pytest
 from lib389.topologies import topology_i2
 from lib389.config import Config
 
+pytestmark = pytest.mark.tier1
+
 def test_config_compare(topology_i2):
     """
     Compare test between cn=config of two different Directory Server intance.

dirsrvtests/tests/suites/lib389/dsldapobject/dn_construct_test.py

@@ -15,6 +15,8 @@ from lib389.topologies import topology_st
 
 from lib389.idm.group import Groups, Group
 
+pytestmark = pytest.mark.tier1
+
 #################################################################################
 # This is a series of test cases to assert that various DN construction scenarios
 # work as expected in lib389.

dirsrvtests/tests/suites/lib389/idm/user_compare_i2_test.py

@@ -4,6 +4,8 @@ from lib389._constants import DEFAULT_SUFFIX
 from lib389.idm.user import UserAccounts, UserAccount
 from lib389.topologies import topology_i2
 
+pytestmark = pytest.mark.tier1
+
 def test_user_compare_i2(topology_i2):
     """
     Compare test between users of two different Directory Server intances.

dirsrvtests/tests/suites/lib389/idm/user_compare_m2Repl_test.py

@@ -5,6 +5,7 @@ from lib389.replica import ReplicationManager
 from lib389.idm.user import UserAccounts, UserAccount
 from lib389.topologies import topology_m2
 
+pytestmark = pytest.mark.tier1
 
 def test_user_compare_m2Repl(topology_m2):
     """

dirsrvtests/tests/suites/lib389/idm/user_compare_st_test.py

@@ -5,6 +5,7 @@ from lib389.idm.group import Groups
 from lib389.idm.user import UserAccounts, UserAccount
 from lib389.topologies import topology_st as topology
 
+pytestmark = pytest.mark.tier1
 
 def test_user_compare(topology):
     """

dirsrvtests/tests/suites/mapping_tree/referral_during_tot_init_test.py

@@ -16,6 +16,8 @@ from lib389.idm.user import (TEST_USER_PROPERTIES, UserAccounts)
 
 from lib389.dbgen import dbgen
 
+pytestmark = pytest.mark.tier1
+
 def test_referral_during_tot(topology_m2):
 
     master1 = topology_m2.ms["master1"]

dirsrvtests/tests/suites/memberof_plugin/regression_test.py

@@ -25,7 +25,8 @@ from lib389.idm.nscontainer import nsContainers
 
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3.7'), reason="Not implemented")
+pytestmark = [pytest.mark.tier1,
+              pytest.mark.skipif(ds_is_older('1.3.7'), reason="Not implemented")]
 
 USER_CN = 'user_'
 GROUP_CN = 'group1'

dirsrvtests/tests/suites/memory_leaks/range_search_test.py

@@ -13,6 +13,8 @@ from lib389.paths import Paths
 from lib389.topologies import topology_st
 from lib389._constants import *
 
+pytestmark = pytest.mark.tier2
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/monitor/monitor_test.py

@@ -12,6 +12,7 @@ else:
     logging.getLogger(__name__).setLevel(logging.INFO)
 log = logging.getLogger(__name__)
 
+pytestmark = pytest.mark.tier1
 def test_monitor(topo):
     """This test is to display monitor attributes to check the performace
 

dirsrvtests/tests/suites/paged_results/paged_results_test.py

@@ -25,6 +25,8 @@ from lib389.backend import Backends
 
 from lib389._mapped_object import DSLdapObject
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv('DEBUGGING', False)
 
 if DEBUGGING:

dirsrvtests/tests/suites/password/password_test.py

@@ -15,6 +15,8 @@ from lib389._constants import PASSWORD, DEFAULT_SUFFIX
 
 from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/password/pbkdf2_upgrade_plugin_test.py

@@ -10,6 +10,8 @@ import pytest
 from lib389.topologies import topology_st
 from lib389.password_plugins import PBKDF2Plugin
 
+pytestmark = pytest.mark.tier1
+
 def test_pbkdf2_upgrade(topology_st):
     """On upgrade pbkdf2 doesn't ship. We need to be able to
     provide this on upgrade to make sure default hashes work.

dirsrvtests/tests/suites/password/pwdAdmin_test.py

@@ -17,6 +17,8 @@ from lib389.idm.domain import Domain
 
 from lib389._constants import SUFFIX, DN_DM, PASSWORD, DEFAULT_SUFFIX
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/password/pwdModify_test.py

@@ -16,6 +16,8 @@ from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 from lib389.idm.organizationalunit import OrganizationalUnits
 from lib389.pwpolicy import PwPolicyManager
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)

dirsrvtests/tests/suites/password/pwdPolicy_attribute_test.py

@@ -15,6 +15,8 @@ from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 from lib389.idm.organizationalunit import OrganizationalUnits
 from lib389._constants import (DEFAULT_SUFFIX, DN_DM, PASSWORD)
 
+pytestmark = pytest.mark.tier1
+
 OU_PEOPLE = 'ou=people,{}'.format(DEFAULT_SUFFIX)
 TEST_USER_NAME = 'simplepaged_test'
 TEST_USER_DN = 'uid={},{}'.format(TEST_USER_NAME, OU_PEOPLE)

dirsrvtests/tests/suites/password/pwdPolicy_controls_test.py

@@ -9,6 +9,7 @@ from lib389.idm.user import UserAccounts
 from lib389._constants import (DN_DM, PASSWORD, DEFAULT_SUFFIX)
 from lib389.idm.organizationalunit import OrganizationalUnits
 
+pytestmark = pytest.mark.tier1
 
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:

dirsrvtests/tests/suites/password/pwdPolicy_inherit_global_test.py

@@ -18,6 +18,8 @@ from lib389.topologies import topology_st
 from lib389.idm.organizationalunit import OrganizationalUnits
 from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.INFO)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/password/pwdPolicy_syntax_test.py

@@ -16,6 +16,7 @@ from lib389._constants import DEFAULT_SUFFIX, PASSWORD, DN_DM
 from lib389.idm.user import UserAccounts
 from lib389.idm.organizationalunit import OrganizationalUnits
 
+pytestmark = pytest.mark.tier1
 
 USER_DN = 'uid=user,ou=People,%s' % DEFAULT_SUFFIX
 USER_RDN = 'user'

dirsrvtests/tests/suites/password/pwdPolicy_token_test.py

@@ -8,6 +8,8 @@ from lib389.idm.user import UserAccounts
 from lib389.idm.organizationalunit import OrganizationalUnits
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)

dirsrvtests/tests/suites/password/pwdPolicy_warning_test.py

@@ -19,6 +19,8 @@ from lib389._constants import (DEFAULT_SUFFIX, DN_CONFIG, PASSWORD, DN_DM,
 from dateutil.parser import parse as dt_parse
 import datetime
 
+pytestmark = pytest.mark.tier1
+
 CONFIG_ATTR = 'passwordSendExpiringTime'
 USER_DN = 'uid=tuser,ou=people,{}'.format(DEFAULT_SUFFIX)
 USER_RDN = 'tuser'

dirsrvtests/tests/suites/password/pwd_algo_test.py

@@ -13,6 +13,8 @@ from lib389.topologies import topology_st
 from lib389._constants import DEFAULT_SUFFIX, HOST_STANDALONE, PORT_STANDALONE
 from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv('DEBUGGING', False)
 USER_DN = 'uid=user,ou=People,%s' % DEFAULT_SUFFIX
 

dirsrvtests/tests/suites/password/pwd_lockout_bypass_test.py

@@ -13,6 +13,8 @@ from lib389.topologies import topology_st
 from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 import ldap
 
+pytestmark = pytest.mark.tier1
+
 # The irony of these names is not lost on me.
 GOOD_PASSWORD = 'password'
 BAD_PASSWORD = 'aontseunao'

dirsrvtests/tests/suites/password/pwd_log_test.py

@@ -14,6 +14,8 @@ from lib389.topologies import topology_st
 from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 from lib389._constants import DN_CONFIG, DEFAULT_SUFFIX
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/password/pwp_history_test.py

@@ -15,6 +15,8 @@ from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 from lib389.idm.organizationalunit import OrganizationalUnits
 from lib389._constants import DN_DM, DEFAULT_SUFFIX, PASSWORD
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/password/regression_test.py

@@ -13,6 +13,8 @@ from lib389.utils import ldap, os, logging
 from lib389.topologies import topology_st as topo
 from lib389.idm.organizationalunit import OrganizationalUnits
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)

dirsrvtests/tests/suites/plugins/acceptance_test.py

@@ -24,6 +24,8 @@ from lib389.idm.organizationalunit import OrganizationalUnits
 from lib389.idm.domain import Domain
 from lib389.topologies import create_topology, topology_i2 as topo
 
+pytestmark = pytest.mark.tier1
+
 log = logging.getLogger(__name__)
 
 USER_DN = 'uid=test_user_1001,ou=people,dc=example,dc=com'

dirsrvtests/tests/suites/plugins/accpol_test.py

@@ -16,6 +16,8 @@ from lib389.idm.user import UserAccounts
 from lib389._constants import (PLUGIN_ACCT_POLICY, DN_PLUGIN, DN_DM, PASSWORD, DEFAULT_SUFFIX,
                                DN_CONFIG, SERVERID_STANDALONE)
 
+pytestmark = pytest.mark.tier1
+
 LOCL_CONF = 'cn=AccountPolicy1,ou=people,dc=example,dc=com'
 TEMPL_COS = 'cn=TempltCoS,ou=people,dc=example,dc=com'
 DEFIN_COS = 'cn=DefnCoS,ou=people,dc=example,dc=com'

dirsrvtests/tests/suites/plugins/attr_nsslapd-pluginarg_test.py

@@ -14,7 +14,8 @@ from lib389.topologies import topology_st
 from lib389._constants import DEFAULT_SUFFIX, DN_PLUGIN, SUFFIX, PLUGIN_7_BIT_CHECK
 
 # Skip on older versions
-pytestmark = pytest.mark.skipif(ds_is_older('1.3'), reason="Not implemented")
+pytestmark = [pytest.mark.tier1,
+              pytest.mark.skipif(ds_is_older('1.3'), reason="Not implemented")]
 
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)

dirsrvtests/tests/suites/plugins/cos_test.py

@@ -20,6 +20,8 @@ from lib389.plugins import *
 from lib389._constants import *
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier1
+
 def add_user(server, uid, testbase, locality=None, tel=None, title=None):
     dn = 'uid=%s,%s' % (uid, testbase)
     log.fatal('Adding user (%s): ' % dn)

dirsrvtests/tests/suites/plugins/dna_test.py

@@ -17,6 +17,8 @@ from lib389.idm.user import UserAccounts
 from lib389.topologies import topology_st
 import ldap
 
+pytestmark = pytest.mark.tier1
+
 log = logging.getLogger(__name__)
 
 

dirsrvtests/tests/suites/plugins/memberof_test.py

@@ -12,6 +12,8 @@ from lib389.utils import *
 from lib389.topologies import topology_st
 from lib389._constants import PLUGIN_MEMBER_OF, SUFFIX
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv('DEBUGGING', False)
 
 logging.getLogger(__name__).setLevel(logging.DEBUG)

dirsrvtests/tests/suites/plugins/pluginpath_validation_test.py

@@ -13,6 +13,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import DEFAULT_SUFFIX, PLUGIN_WHOAMI
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/plugins/referint_test.py

@@ -22,6 +22,8 @@ from lib389.idm.user import UserAccounts, UserAccount
 from lib389.idm.group import Groups
 from lib389.topologies import topology_st as topo
 
+pytestmark = pytest.mark.tier1
+
 log = logging.getLogger(__name__)
 
 ESCAPED_RDN_BASE = "foo\\,oo"

dirsrvtests/tests/suites/plugins/rootdn_plugin_test.py

@@ -17,6 +17,8 @@ from lib389.topologies import topology_st
 
 from lib389._constants import PLUGIN_ROOTDN_ACCESS, DN_CONFIG, DEFAULT_SUFFIX, DN_DM, PASSWORD, LOCALHOST_IP
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/psearch/psearch_test.py

@@ -13,6 +13,7 @@ from lib389.idm.group import Groups
 import ldap
 from ldap.controls.psearch import PersistentSearchControl,EntryChangeNotificationControl
 
+pytestmark = pytest.mark.tier1
 
 def _run_psearch(inst, msg_id):
     """Run a search with EntryChangeNotificationControl"""

dirsrvtests/tests/suites/referint_plugin/rename_test.py

@@ -7,7 +7,7 @@
 # --- END COPYRIGHT BLOCK ---
 #
 
-
+import pytest
 from lib389._constants import DEFAULT_SUFFIX
 from lib389.topologies import topology_m2
 
@@ -18,6 +18,8 @@ from lib389.idm.organizationalunit import OrganizationalUnit as OrganisationalUn
 
 from lib389.plugins import AutoMembershipPlugin, ReferentialIntegrityPlugin, AutoMembershipDefinitions, MemberOfPlugin
 
+pytestmark = pytest.mark.tier2
+
 UCOUNT = 400
 
 def _enable_plugins(inst, group_dn):

dirsrvtests/tests/suites/replication/acceptance_test.py

@@ -16,6 +16,8 @@ from lib389.idm.user import UserAccount
 from lib389.replica import ReplicationManager
 from lib389._constants import *
 
+pytestmark = pytest.mark.tier0
+
 TEST_ENTRY_NAME = 'mmrepl_test'
 TEST_ENTRY_DN = 'uid={},{}'.format(TEST_ENTRY_NAME, DEFAULT_SUFFIX)
 NEW_SUFFIX_NAME = 'test_repl'

dirsrvtests/tests/suites/replication/cascading_test.py

@@ -18,6 +18,8 @@ from lib389.idm.user import UserAccount, TEST_USER_PROPERTIES
 from lib389.idm.group import Groups
 from lib389.topologies import topology_m1h1c1 as topo
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)

dirsrvtests/tests/suites/replication/changelog_test.py

@@ -19,6 +19,8 @@ from lib389._constants import *
 from lib389.tasks import *
 from lib389.utils import *
 
+pytestmark = pytest.mark.tier1
+
 TEST_ENTRY_NAME = 'replusr'
 NEW_RDN_NAME = 'cl5usr'
 CHANGELOG = 'cn=changelog5,cn=config'

dirsrvtests/tests/suites/replication/changelog_trimming_test.py

@@ -9,6 +9,8 @@ from lib389.topologies import topology_m1 as topo
 from lib389.changelog import Changelog5
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)

dirsrvtests/tests/suites/replication/cleanallruv_test.py

@@ -22,6 +22,8 @@ from lib389.tasks import CleanAllRUVTask
 from lib389.idm.user import UserAccounts
 from lib389.config import LDBMConfig
 
+pytestmark = pytest.mark.tier1
+
 logging.getLogger(__name__).setLevel(logging.DEBUG)
 log = logging.getLogger(__name__)
 

dirsrvtests/tests/suites/replication/conflict_resolve_test.py

@@ -20,6 +20,8 @@ from lib389.replica import ReplicationManager
 from lib389.agreement import Agreements
 from lib389.plugins import MemberOfPlugin
 
+pytestmark = pytest.mark.tier1
+
 DEBUGGING = os.getenv("DEBUGGING", default=False)
 if DEBUGGING:
     logging.getLogger(__name__).setLevel(logging.DEBUG)

dirsrvtests/tests/suites/replication/encryption_cl5_test.py

@@ -15,6 +15,8 @@ from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
 from lib389.topologies import topology_m2
 from lib389._constants import *
 
+pytestmark = pytest.mark.tier1
+
 ATTRIBUTE = 'unhashed#user#password'
 
 DEBUGGING = os.getenv("DEBUGGING", default=False)

dirsrvtests/tests/suites/replication/regression_nsslapd_plugin_binddn_tracking_test.py

@@ -16,6 +16,8 @@ from lib389._constants import *
 from lib389.idm.user import UserAccounts
 from lib389.idm.domain import Domain
 
+pytestmark = pytest.mark.tier1
+
 log = logging.getLogger(__name__)