summaryrefslogtreecommitdiffstats
path: root/ipatests/test_ipapython
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_ipapython
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_ipapython')
-rw-r--r--ipatests/test_ipapython/test_cookie.py4
-rw-r--r--ipatests/test_ipapython/test_dn.py4
-rw-r--r--ipatests/test_ipapython/test_ipap11helper.py1
-rw-r--r--ipatests/test_ipapython/test_ipautil.py4
-rw-r--r--ipatests/test_ipapython/test_ipavalidate.py3
-rw-r--r--ipatests/test_ipapython/test_keyring.py4
-rw-r--r--ipatests/test_ipapython/test_ssh.py3
7 files changed, 23 insertions, 0 deletions
diff --git a/ipatests/test_ipapython/test_cookie.py b/ipatests/test_ipapython/test_cookie.py
index b8a2d36da..5b71b0745 100644
--- a/ipatests/test_ipapython/test_cookie.py
+++ b/ipatests/test_ipapython/test_cookie.py
@@ -24,6 +24,10 @@ import email.utils
import calendar
from ipapython.cookie import Cookie
+import pytest
+
+pytestmark = pytest.mark.tier0
+
class TestParse(unittest.TestCase):
def test_parse(self):
diff --git a/ipatests/test_ipapython/test_dn.py b/ipatests/test_ipapython/test_dn.py
index fe498cc3d..eb763b3a6 100644
--- a/ipatests/test_ipapython/test_dn.py
+++ b/ipatests/test_ipapython/test_dn.py
@@ -1,5 +1,7 @@
import contextlib
import unittest
+import pytest
+from ipapython.dn import * # FIXME
import six
@@ -29,6 +31,8 @@ if six.PY3:
assert a >= b
return 1
+pytestmark = pytest.mark.tier0
+
def expected_class(klass, component):
if klass is AVA:
diff --git a/ipatests/test_ipapython/test_ipap11helper.py b/ipatests/test_ipapython/test_ipap11helper.py
index 32e87503d..0b442b553 100644
--- a/ipatests/test_ipapython/test_ipap11helper.py
+++ b/ipatests/test_ipapython/test_ipap11helper.py
@@ -19,6 +19,7 @@ from ipaplatform.paths import paths
import _ipap11helper
+pytestmark = pytest.mark.tier0
CONFIG_DATA = """
# SoftHSM v2 configuration file
diff --git a/ipatests/test_ipapython/test_ipautil.py b/ipatests/test_ipapython/test_ipautil.py
index e19cd2cb6..d574bd809 100644
--- a/ipatests/test_ipapython/test_ipautil.py
+++ b/ipatests/test_ipapython/test_ipautil.py
@@ -28,6 +28,10 @@ import six
from ipapython import ipautil
+import pytest
+
+pytestmark = pytest.mark.tier0
+
def make_ipaddress_checker(addr, words=None, prefixlen=None):
def check_ipaddress():
diff --git a/ipatests/test_ipapython/test_ipavalidate.py b/ipatests/test_ipapython/test_ipavalidate.py
index b912797dd..54a62f664 100644
--- a/ipatests/test_ipapython/test_ipavalidate.py
+++ b/ipatests/test_ipapython/test_ipavalidate.py
@@ -21,9 +21,12 @@ import sys
sys.path.insert(0, ".")
import unittest
+import pytest
from ipapython import ipavalidate
+pytestmark = pytest.mark.tier0
+
class TestValidate(unittest.TestCase):
def test_validEmail(self):
self.assertEqual(True, ipavalidate.Email("test@freeipa.org"))
diff --git a/ipatests/test_ipapython/test_keyring.py b/ipatests/test_ipapython/test_keyring.py
index 0a7f0980c..84b9f0ffa 100644
--- a/ipatests/test_ipapython/test_keyring.py
+++ b/ipatests/test_ipapython/test_keyring.py
@@ -23,6 +23,10 @@ Test the `kernel_keyring.py` module.
from nose.tools import raises, assert_raises # pylint: disable=E0611
from ipapython import kernel_keyring
+import pytest
+
+pytestmark = pytest.mark.tier0
+
TEST_KEY = 'ipa_test'
TEST_VALUE = 'abc123'
UPDATE_VALUE = '123abc'
diff --git a/ipatests/test_ipapython/test_ssh.py b/ipatests/test_ipapython/test_ssh.py
index 2930ea655..509d1a085 100644
--- a/ipatests/test_ipapython/test_ssh.py
+++ b/ipatests/test_ipapython/test_ssh.py
@@ -24,12 +24,15 @@ import base64
import six
import nose
+import pytest
from ipapython import ssh
if six.PY3:
unicode = str
+pytestmark = pytest.mark.tier0
+
def make_public_key_checker(pk, out):
def check_public_key():