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_ipaserver/test_install | |
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_ipaserver/test_install')
-rwxr-xr-x | ipatests/test_ipaserver/test_install/test_adtrustinstance.py | 3 | ||||
-rw-r--r-- | ipatests/test_ipaserver/test_install/test_service.py | 2 |
2 files changed, 5 insertions, 0 deletions
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' |