summaryrefslogtreecommitdiffstats
path: root/ipatests/test_cmdline
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_cmdline
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_cmdline')
-rw-r--r--ipatests/test_cmdline/test_cli.py2
-rw-r--r--ipatests/test_cmdline/test_help.py2
-rw-r--r--ipatests/test_cmdline/test_ipagetkeytab.py3
3 files changed, 7 insertions, 0 deletions
diff --git a/ipatests/test_cmdline/test_cli.py b/ipatests/test_cmdline/test_cli.py
index 74a7c6ca4..c2203e68f 100644
--- a/ipatests/test_cmdline/test_cli.py
+++ b/ipatests/test_cmdline/test_cli.py
@@ -9,11 +9,13 @@ from six import StringIO
from ipatests import util
from ipalib import api, errors
from ipapython.version import API_VERSION
+import pytest
if six.PY3:
unicode = str
+@pytest.mark.tier0
class TestCLIParsing(object):
"""Tests that commandlines are correctly parsed to Command keyword args
"""
diff --git a/ipatests/test_cmdline/test_help.py b/ipatests/test_cmdline/test_help.py
index cdbfd8ea9..fee942007 100644
--- a/ipatests/test_cmdline/test_help.py
+++ b/ipatests/test_cmdline/test_help.py
@@ -26,11 +26,13 @@ from six import StringIO
from ipalib import api, errors
from ipalib.plugins.user import user_add
+import pytest
if six.PY3:
unicode = str
+@pytest.mark.tier0
class CLITestContext(object):
"""Context manager that replaces stdout & stderr, and catches SystemExit
diff --git a/ipatests/test_cmdline/test_ipagetkeytab.py b/ipatests/test_cmdline/test_ipagetkeytab.py
index 7b57ba194..d903305ed 100644
--- a/ipatests/test_cmdline/test_ipagetkeytab.py
+++ b/ipatests/test_cmdline/test_ipagetkeytab.py
@@ -32,6 +32,7 @@ import tempfile
import gssapi
from ipaserver.plugins.ldap2 import ldap2
from ipapython.dn import DN
+import pytest
def use_keytab(principal, keytab):
try:
@@ -52,6 +53,8 @@ def use_keytab(principal, keytab):
if tmpdir:
shutil.rmtree(tmpdir)
+
+@pytest.mark.tier0
class test_ipagetkeytab(cmdline_test):
"""
Test `ipa-getkeytab`.