summaryrefslogtreecommitdiffstats
path: root/ipatests/test_ipapython
diff options
context:
space:
mode:
Diffstat (limited to 'ipatests/test_ipapython')
-rw-r--r--ipatests/test_ipapython/test_ipavalidate.py6
-rw-r--r--ipatests/test_ipapython/test_keyring.py2
2 files changed, 1 insertions, 7 deletions
diff --git a/ipatests/test_ipapython/test_ipavalidate.py b/ipatests/test_ipapython/test_ipavalidate.py
index 3393de00e..b912797dd 100644
--- a/ipatests/test_ipapython/test_ipavalidate.py
+++ b/ipatests/test_ipapython/test_ipavalidate.py
@@ -25,12 +25,6 @@ import unittest
from ipapython import ipavalidate
class TestValidate(unittest.TestCase):
- def setUp(self):
- pass
-
- def tearDown(self):
- pass
-
def test_validEmail(self):
self.assertEqual(True, ipavalidate.Email("test@freeipa.org"))
self.assertEqual(True, ipavalidate.Email("", notEmpty=False))
diff --git a/ipatests/test_ipapython/test_keyring.py b/ipatests/test_ipapython/test_keyring.py
index 568fd5ee1..e92b1b465 100644
--- a/ipatests/test_ipapython/test_keyring.py
+++ b/ipatests/test_ipapython/test_keyring.py
@@ -36,7 +36,7 @@ class test_keyring(object):
Test the kernel keyring interface
"""
- def setUp(self):
+ def setup(self):
try:
kernel_keyring.del_key(TEST_KEY)
except ValueError: