diff options
| author | Milan Kubik <mkubik@redhat.com> | 2015-04-24 14:39:48 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2015-11-09 11:49:17 +0100 |
| commit | 0a64e9bd7061550b478be889b0e7fc90f560b06c (patch) | |
| tree | 125f97a97bfab06c06dadbef1b7983e0d5f97263 /ipatests/test_ipalib | |
| parent | 4d94367006287ed0a04c092a7b86096518cf5b8c (diff) | |
| download | freeipa-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_ipalib')
| -rw-r--r-- | ipatests/test_ipalib/test_aci.py | 4 | ||||
| -rw-r--r-- | ipatests/test_ipalib/test_backend.py | 2 | ||||
| -rw-r--r-- | ipatests/test_ipalib/test_base.py | 4 | ||||
| -rw-r--r-- | ipatests/test_ipalib/test_capabilities.py | 3 | ||||
| -rw-r--r-- | ipatests/test_ipalib/test_cli.py | 3 | ||||
| -rw-r--r-- | ipatests/test_ipalib/test_config.py | 3 | ||||
| -rw-r--r-- | ipatests/test_ipalib/test_crud.py | 3 | ||||
| -rw-r--r-- | ipatests/test_ipalib/test_errors.py | 4 | ||||
| -rw-r--r-- | ipatests/test_ipalib/test_frontend.py | 4 | ||||
| -rw-r--r-- | ipatests/test_ipalib/test_messages.py | 3 | ||||
| -rw-r--r-- | ipatests/test_ipalib/test_output.py | 4 | ||||
| -rw-r--r-- | ipatests/test_ipalib/test_parameters.py | 4 | ||||
| -rw-r--r-- | ipatests/test_ipalib/test_plugable.py | 3 | ||||
| -rw-r--r-- | ipatests/test_ipalib/test_text.py | 3 | ||||
| -rw-r--r-- | ipatests/test_ipalib/test_x509.py | 4 |
15 files changed, 51 insertions, 0 deletions
diff --git a/ipatests/test_ipalib/test_aci.py b/ipatests/test_ipalib/test_aci.py index fc484988f..8ced2a93c 100644 --- a/ipatests/test_ipalib/test_aci.py +++ b/ipatests/test_ipalib/test_aci.py @@ -25,6 +25,10 @@ from __future__ import print_function from ipalib.aci import ACI +import pytest + +pytestmark = pytest.mark.tier0 + def check_aci_parsing(source, expected): a = ACI(source) print('ACI was: ', a) diff --git a/ipatests/test_ipalib/test_backend.py b/ipatests/test_ipalib/test_backend.py index 4e014f654..086831037 100644 --- a/ipatests/test_ipalib/test_backend.py +++ b/ipatests/test_ipalib/test_backend.py @@ -34,7 +34,9 @@ from ipalib.frontend import Command from ipalib import backend, plugable, errors, base from ipapython.version import API_VERSION +import pytest +pytestmark = pytest.mark.tier0 class test_Backend(ClassChecker): """ diff --git a/ipatests/test_ipalib/test_base.py b/ipatests/test_ipalib/test_base.py index 9b1b6a778..d69ee67f6 100644 --- a/ipatests/test_ipalib/test_base.py +++ b/ipatests/test_ipalib/test_base.py @@ -22,6 +22,7 @@ Test the `ipalib.base` module. """ import six +import pytest from ipatests.util import ClassChecker, raises from ipalib.constants import NAME_REGEX, NAME_ERROR @@ -32,6 +33,9 @@ if six.PY3: unicode = str +pytestmark = pytest.mark.tier0 + + class test_ReadOnly(ClassChecker): """ Test the `ipalib.base.ReadOnly` class diff --git a/ipatests/test_ipalib/test_capabilities.py b/ipatests/test_ipalib/test_capabilities.py index 21e53c2dc..9a44fbebc 100644 --- a/ipatests/test_ipalib/test_capabilities.py +++ b/ipatests/test_ipalib/test_capabilities.py @@ -23,6 +23,9 @@ Test the `ipalib.errors` module. from ipalib.capabilities import capabilities, client_has_capability +import pytest + +pytestmark = pytest.mark.tier0 def test_client_has_capability(): assert capabilities['messages'] == u'2.52' diff --git a/ipatests/test_ipalib/test_cli.py b/ipatests/test_ipalib/test_cli.py index 0c3affcd3..3004e1f76 100644 --- a/ipatests/test_ipalib/test_cli.py +++ b/ipatests/test_ipalib/test_cli.py @@ -24,6 +24,9 @@ Test the `ipalib.cli` module. from ipatests.util import raises, get_api, ClassChecker from ipalib import cli, plugable, frontend, backend +import pytest + +pytestmark = pytest.mark.tier0 class test_textui(ClassChecker): _cls = cli.textui diff --git a/ipatests/test_ipalib/test_config.py b/ipatests/test_ipalib/test_config.py index 5a0de1e1f..09885a578 100644 --- a/ipatests/test_ipalib/test_config.py +++ b/ipatests/test_ipalib/test_config.py @@ -34,6 +34,9 @@ from ipalib.constants import NAME_REGEX, NAME_ERROR from ipalib import config, constants, base from ipaplatform.paths import paths +import pytest + +pytestmark = pytest.mark.tier0 # Valid environment variables in (key, raw, value) tuples: # key: the name of the environment variable diff --git a/ipatests/test_ipalib/test_crud.py b/ipatests/test_ipalib/test_crud.py index 910da279d..c4b69c556 100644 --- a/ipatests/test_ipalib/test_crud.py +++ b/ipatests/test_ipalib/test_crud.py @@ -25,6 +25,9 @@ from ipatests.util import read_only, raises, get_api, ClassChecker from ipalib import crud, frontend, plugable, config from ipalib.parameters import Str +import pytest + +pytestmark = pytest.mark.tier0 class CrudChecker(ClassChecker): """ diff --git a/ipatests/test_ipalib/test_errors.py b/ipatests/test_ipalib/test_errors.py index 954bfcd9a..4dc84501b 100644 --- a/ipatests/test_ipalib/test_errors.py +++ b/ipatests/test_ipalib/test_errors.py @@ -26,6 +26,7 @@ Test the `ipalib.errors` module. import re import inspect +import pytest import six @@ -38,6 +39,9 @@ if six.PY3: unicode = str +pytestmark = pytest.mark.tier0 + + class PrivateExceptionTester(object): _klass = None __klass = None diff --git a/ipatests/test_ipalib/test_frontend.py b/ipatests/test_ipalib/test_frontend.py index ace6b7eb4..a4af5e43c 100644 --- a/ipatests/test_ipalib/test_frontend.py +++ b/ipatests/test_ipalib/test_frontend.py @@ -23,6 +23,7 @@ Test the `ipalib.frontend` module. # FIXME: Pylint errors # pylint: disable=no-member +import pytest import six @@ -40,6 +41,9 @@ if six.PY3: unicode = str +pytestmark = pytest.mark.tier0 + + def test_RULE_FLAG(): assert frontend.RULE_FLAG == 'validation_rule' diff --git a/ipatests/test_ipalib/test_messages.py b/ipatests/test_ipalib/test_messages.py index 966a6c133..dad0e988a 100644 --- a/ipatests/test_ipalib/test_messages.py +++ b/ipatests/test_ipalib/test_messages.py @@ -25,6 +25,9 @@ from ipalib import messages from ipalib.capabilities import capabilities from ipatests.test_ipalib import test_errors +import pytest + +pytestmark = pytest.mark.tier0 class HelloMessage(messages.PublicMessage): type = 'info' diff --git a/ipatests/test_ipalib/test_output.py b/ipatests/test_ipalib/test_output.py index 1161e649a..927da74f3 100644 --- a/ipatests/test_ipalib/test_output.py +++ b/ipatests/test_ipalib/test_output.py @@ -27,6 +27,10 @@ from ipalib.frontend import Command from ipalib import _ from ipapython.version import API_VERSION +import pytest + +pytestmark = pytest.mark.tier0 + class test_Output(ClassChecker): """ Test the `ipalib.output.Output` class. diff --git a/ipatests/test_ipalib/test_parameters.py b/ipatests/test_ipalib/test_parameters.py index c1ebf900d..b640f50da 100644 --- a/ipatests/test_ipalib/test_parameters.py +++ b/ipatests/test_ipalib/test_parameters.py @@ -31,6 +31,7 @@ import sys from decimal import Decimal from inspect import isclass from six.moves.xmlrpc_client import MAXINT, MININT +import pytest import six @@ -48,6 +49,9 @@ if six.PY3: NULLS = (None, b'', u'', tuple(), []) +pytestmark = pytest.mark.tier0 + + class test_DefaultFrom(ClassChecker): """ Test the `ipalib.parameters.DefaultFrom` class. diff --git a/ipatests/test_ipalib/test_plugable.py b/ipatests/test_ipalib/test_plugable.py index caf08d6b9..3e7e64bc8 100644 --- a/ipatests/test_ipalib/test_plugable.py +++ b/ipatests/test_ipalib/test_plugable.py @@ -31,6 +31,9 @@ from ipatests.util import ClassChecker, create_test_api from ipalib import plugable, errors, text from ipaplatform.paths import paths +import pytest + +pytestmark = pytest.mark.tier0 class test_Plugin(ClassChecker): """ diff --git a/ipatests/test_ipalib/test_text.py b/ipatests/test_ipalib/test_text.py index 195610d27..acf0bc22c 100644 --- a/ipatests/test_ipalib/test_text.py +++ b/ipatests/test_ipalib/test_text.py @@ -30,6 +30,7 @@ import re import nose import locale import six +import pytest from ipatests.util import raises, assert_equal from ipatests.i18n import create_po, po_file_iterate @@ -41,6 +42,8 @@ from ipapython.ipautil import file_exists if six.PY3: unicode = str +pytestmark = pytest.mark.tier0 + singular = '%(count)d goose makes a %(dish)s' plural = '%(count)d geese make a %(dish)s' diff --git a/ipatests/test_ipalib/test_x509.py b/ipatests/test_ipalib/test_x509.py index d8004c4a0..28745ffd8 100644 --- a/ipatests/test_ipalib/test_x509.py +++ b/ipatests/test_ipalib/test_x509.py @@ -29,6 +29,10 @@ from nss.error import NSPRError from ipalib import x509 from ipapython.dn import DN +import pytest + +pytestmark = pytest.mark.tier0 + # certutil - # certificate for CN=ipa.example.com,O=IPA |
