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>

7 files changed, 15 insertions, 0 deletions

diff --git a/ipatests/test_ipaserver/test_changepw.py b/ipatests/test_ipaserver/test_changepw.py
index 2a44017d4..866ea5554 100644
--- a/ipatests/test_ipaserver/test_changepw.py
+++ b/ipatests/test_ipaserver/test_changepw.py
@@ -19,6 +19,7 @@
 
 import nose
 import ldap
+import pytest
 
 from ipatests.test_ipaserver.httptest import Unauthorized_HTTP_test
 from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test
@@ -30,6 +31,8 @@ testuser = u'tuser'
 old_password = u'old_password'
 new_password = u'new_password'
 
+
+@pytest.mark.tier1
 class test_changepw(XMLRPC_test, Unauthorized_HTTP_test):
     app_uri = '/ipa/session/change_password'
 
diff --git a/ipatests/test_ipaserver/test_install/test_adtrustinstance.py b/ipatests/test_ipaserver/test_install/test_adtrustinstance.py
index 75e53f35e..6a050c80e 100755
--- a/ipatests/test_ipaserver/test_install/test_adtrustinstance.py
+++ b/ipatests/test_ipaserver/test_install/test_adtrustinstance.py
@@ -24,12 +24,15 @@ import os
 
 import six
 import nose
+import pytest
 
 from ipaserver.install import adtrustinstance
 
 if six.PY3:
     unicode = str
 
+
+@pytest.mark.tier0
 class test_adtrustinstance:
     """
     Test `adtrustinstance`.
diff --git a/ipatests/test_ipaserver/test_install/test_service.py b/ipatests/test_ipaserver/test_install/test_service.py
index 956ae6256..71519d7d1 100644
--- a/ipatests/test_ipaserver/test_install/test_service.py
+++ b/ipatests/test_ipaserver/test_install/test_service.py
@@ -22,8 +22,10 @@ Tests for the `ipaserver.service` module.
 """
 
 from ipaserver.install import service
+import pytest
 
 
+@pytest.mark.tier0
 def test_format_seconds():
     assert service.format_seconds(0) == '0 seconds'
     assert service.format_seconds(1) == '1 second'
diff --git a/ipatests/test_ipaserver/test_ldap.py b/ipatests/test_ipaserver/test_ldap.py
index 47d37c9bf..13186a6fd 100644
--- a/ipatests/test_ipaserver/test_ldap.py
+++ b/ipatests/test_ipaserver/test_ldap.py
@@ -45,6 +45,8 @@ from ipapython.dn import DN
 if six.PY3:
     unicode = str
 
+
+@pytest.mark.tier0
 class test_ldap(object):
     """
     Test various LDAP client bind methods.
@@ -155,6 +157,7 @@ class test_ldap(object):
         assert serial is not None
 
 
+@pytest.mark.tier0
 class test_LDAPEntry(object):
     """
     Test the LDAPEntry class
diff --git a/ipatests/test_ipaserver/test_otptoken_import.py b/ipatests/test_ipaserver/test_otptoken_import.py
index 798f721f5..3325b0c5a 100644
--- a/ipatests/test_ipaserver/test_otptoken_import.py
+++ b/ipatests/test_ipaserver/test_otptoken_import.py
@@ -29,6 +29,7 @@ from ipaserver.install.ipa_otptoken_import import PSKCDocument, ValidationError
 basename = os.path.join(os.path.dirname(__file__), "data")
 
 @pytest.mark.skipif(True, reason="Causes NSS errors. Ticket 5192")
+@pytest.mark.tier1
 class test_otptoken_import(object):
 
     def teardown(self):
diff --git a/ipatests/test_ipaserver/test_rpcserver.py b/ipatests/test_ipaserver/test_rpcserver.py
index ce5a03a13..976ebf7d6 100644
--- a/ipatests/test_ipaserver/test_rpcserver.py
+++ b/ipatests/test_ipaserver/test_rpcserver.py
@@ -22,6 +22,7 @@ Test the `ipaserver.rpc` module.
 """
 
 import json
+import pytest
 
 import six
 
@@ -33,6 +34,7 @@ from ipaserver import rpcserver
 if six.PY3:
     unicode = str
 
+pytestmark = pytest.mark.tier0
 
 class StartResponse(object):
     def __init__(self):
diff --git a/ipatests/test_ipaserver/test_topology_plugin.py b/ipatests/test_ipaserver/test_topology_plugin.py
index b162822e0..6407f3e6f 100644
--- a/ipatests/test_ipaserver/test_topology_plugin.py
+++ b/ipatests/test_ipaserver/test_topology_plugin.py
@@ -11,6 +11,7 @@ from ipapython.dn import DN
 import pytest
 
 
+@pytest.mark.tier1
 class TestTopologyPlugin(object):
     """
     Test Topology plugin from the DS point of view