summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2012-04-20 07:03:16 -0400
committerPetr Viktorin <pviktori@redhat.com>2013-09-25 10:13:56 +0200
commit3e505fe532e2d945b72bf434023680cdb222e96c (patch)
tree603190a4dc0c53332a17d7e3864b06ab1c454828
parenta9843d6918f73c2236d0083b1e8adf54ca34eb0d (diff)
downloadfreeipa-3e505fe532e2d945b72bf434023680cdb222e96c.tar.gz
freeipa-3e505fe532e2d945b72bf434023680cdb222e96c.tar.xz
freeipa-3e505fe532e2d945b72bf434023680cdb222e96c.zip
Move tests to test directories
Nose doesn't pick up directories that don't begin with 'test'. Rename ipatests/test_ipaserver/install to test_install so that it's run. Also, merge test_ipautil.py from ipapython/test into tests/test_ipapython, so the whole test suite is in one place.
-rw-r--r--freeipa.spec.in2
-rw-r--r--ipapython/test/test_ipautil.py309
-rw-r--r--ipatests/setup.py.in2
-rw-r--r--ipatests/test_ipapython/test_ipautil.py280
-rw-r--r--ipatests/test_ipapython/test_ipavalidate.py (renamed from ipapython/test/test_ipavalidate.py)0
-rwxr-xr-xipatests/test_ipaserver/test_install/test_adtrustinstance.py (renamed from ipatests/test_ipaserver/install/test_adtrustinstance.py)0
6 files changed, 282 insertions, 311 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 88c02258..cb2a818b 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -822,7 +822,7 @@ fi
%dir %{python_sitelib}/ipatests/test_ipalib
%dir %{python_sitelib}/ipatests/test_ipapython
%dir %{python_sitelib}/ipatests/test_ipaserver
-%dir %{python_sitelib}/ipatests/test_ipaserver/install
+%dir %{python_sitelib}/ipatests/test_ipaserver/test_install
%dir %{python_sitelib}/ipatests/test_pkcs10
%dir %{python_sitelib}/ipatests/test_webui
%dir %{python_sitelib}/ipatests/test_xmlrpc
diff --git a/ipapython/test/test_ipautil.py b/ipapython/test/test_ipautil.py
deleted file mode 100644
index ff9f2823..00000000
--- a/ipapython/test/test_ipautil.py
+++ /dev/null
@@ -1,309 +0,0 @@
-#! /usr/bin/python -E
-#
-# Copyright (C) 2007 Red Hat
-# see file 'COPYING' for use and warranty information
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-import sys
-sys.path.insert(0, ".")
-
-import unittest
-import datetime
-
-from ipapython import ipautil
-
-
-class TestCIDict(unittest.TestCase):
- def setUp(self):
- self.cidict = ipautil.CIDict()
- self.cidict["Key1"] = "val1"
- self.cidict["key2"] = "val2"
- self.cidict["KEY3"] = "VAL3"
-
- def tearDown(self):
- pass
-
- def testLen(self):
- self.assertEqual(3, len(self.cidict))
-
- def test__GetItem(self):
- self.assertEqual("val1", self.cidict["Key1"])
- self.assertEqual("val1", self.cidict["key1"])
- self.assertEqual("val2", self.cidict["KEY2"])
- self.assertEqual("VAL3", self.cidict["key3"])
- self.assertEqual("VAL3", self.cidict["KEY3"])
- try:
- self.cidict["key4"]
- fail("should have raised KeyError")
- except KeyError:
- pass
-
- def testGet(self):
- self.assertEqual("val1", self.cidict.get("Key1"))
- self.assertEqual("val1", self.cidict.get("key1"))
- self.assertEqual("val2", self.cidict.get("KEY2"))
- self.assertEqual("VAL3", self.cidict.get("key3"))
- self.assertEqual("VAL3", self.cidict.get("KEY3"))
- self.assertEqual("default", self.cidict.get("key4", "default"))
-
- def test__SetItem(self):
- self.cidict["key4"] = "val4"
- self.assertEqual("val4", self.cidict["key4"])
- self.cidict["KEY4"] = "newval4"
- self.assertEqual("newval4", self.cidict["key4"])
-
- def testDel(self):
- self.assert_(self.cidict.has_key("Key1"))
- del(self.cidict["Key1"])
- self.failIf(self.cidict.has_key("Key1"))
-
- self.assert_(self.cidict.has_key("key2"))
- del(self.cidict["KEY2"])
- self.failIf(self.cidict.has_key("key2"))
-
- def testClear(self):
- self.assertEqual(3, len(self.cidict))
- self.cidict.clear()
- self.assertEqual(0, len(self.cidict))
-
- def testCopy(self):
- """A copy is no longer a CIDict, but should preserve the case of
- the keys as they were inserted."""
- copy = self.cidict.copy()
- self.assertEqual(3, len(copy))
- self.assert_(copy.has_key("Key1"))
- self.assertEqual("val1", copy["Key1"])
- self.failIf(copy.has_key("key1"))
-
- def testHasKey(self):
- self.assert_(self.cidict.has_key("KEY1"))
- self.assert_(self.cidict.has_key("key2"))
- self.assert_(self.cidict.has_key("key3"))
-
- def testItems(self):
- items = self.cidict.items()
- self.assertEqual(3, len(items))
- items_set = set(items)
- self.assert_(("Key1", "val1") in items_set)
- self.assert_(("key2", "val2") in items_set)
- self.assert_(("KEY3", "VAL3") in items_set)
-
- def testIterItems(self):
- items = []
- for (k,v) in self.cidict.iteritems():
- items.append((k,v))
- self.assertEqual(3, len(items))
- items_set = set(items)
- self.assert_(("Key1", "val1") in items_set)
- self.assert_(("key2", "val2") in items_set)
- self.assert_(("KEY3", "VAL3") in items_set)
-
- def testIterKeys(self):
- keys = []
- for k in self.cidict.iterkeys():
- keys.append(k)
- self.assertEqual(3, len(keys))
- keys_set = set(keys)
- self.assert_("Key1" in keys_set)
- self.assert_("key2" in keys_set)
- self.assert_("KEY3" in keys_set)
-
- def testIterValues(self):
- values = []
- for k in self.cidict.itervalues():
- values.append(k)
- self.assertEqual(3, len(values))
- values_set = set(values)
- self.assert_("val1" in values_set)
- self.assert_("val2" in values_set)
- self.assert_("VAL3" in values_set)
-
- def testKeys(self):
- keys = self.cidict.keys()
- self.assertEqual(3, len(keys))
- keys_set = set(keys)
- self.assert_("Key1" in keys_set)
- self.assert_("key2" in keys_set)
- self.assert_("KEY3" in keys_set)
-
- def testValues(self):
- values = self.cidict.values()
- self.assertEqual(3, len(values))
- values_set = set(values)
- self.assert_("val1" in values_set)
- self.assert_("val2" in values_set)
- self.assert_("VAL3" in values_set)
-
- def testUpdate(self):
- newdict = { "KEY2": "newval2",
- "key4": "val4" }
- self.cidict.update(newdict)
- self.assertEqual(4, len(self.cidict))
-
- items = self.cidict.items()
- self.assertEqual(4, len(items))
- items_set = set(items)
- self.assert_(("Key1", "val1") in items_set)
- # note the update "overwrites" the case of the key2
- self.assert_(("KEY2", "newval2") in items_set)
- self.assert_(("KEY3", "VAL3") in items_set)
- self.assert_(("key4", "val4") in items_set)
-
- def testSetDefault(self):
- self.assertEqual("val1", self.cidict.setdefault("KEY1", "default"))
-
- self.failIf(self.cidict.has_key("KEY4"))
- self.assertEqual("default", self.cidict.setdefault("KEY4", "default"))
- self.assert_(self.cidict.has_key("KEY4"))
- self.assertEqual("default", self.cidict["key4"])
-
- self.failIf(self.cidict.has_key("KEY5"))
- self.assertEqual(None, self.cidict.setdefault("KEY5"))
- self.assert_(self.cidict.has_key("KEY5"))
- self.assertEqual(None, self.cidict["key5"])
-
- def testPop(self):
- self.assertEqual("val1", self.cidict.pop("KEY1", "default"))
- self.failIf(self.cidict.has_key("key1"))
-
- self.assertEqual("val2", self.cidict.pop("KEY2"))
- self.failIf(self.cidict.has_key("key2"))
-
- self.assertEqual("default", self.cidict.pop("key4", "default"))
- try:
- self.cidict.pop("key4")
- fail("should have raised KeyError")
- except KeyError:
- pass
-
- def testPopItem(self):
- items = set(self.cidict.items())
- self.assertEqual(3, len(self.cidict))
-
- item = self.cidict.popitem()
- self.assertEqual(2, len(self.cidict))
- self.assert_(item in items)
- items.discard(item)
-
- item = self.cidict.popitem()
- self.assertEqual(1, len(self.cidict))
- self.assert_(item in items)
- items.discard(item)
-
- item = self.cidict.popitem()
- self.assertEqual(0, len(self.cidict))
- self.assert_(item in items)
- items.discard(item)
-
-class TestTimeParser(unittest.TestCase):
- def setUp(self):
- pass
-
- def tearDown(self):
- pass
-
- def testSimple(self):
- timestr = "20070803"
-
- time = ipautil.parse_generalized_time(timestr)
- self.assertEqual(2007, time.year)
- self.assertEqual(8, time.month)
- self.assertEqual(3, time.day)
- self.assertEqual(0, time.hour)
- self.assertEqual(0, time.minute)
- self.assertEqual(0, time.second)
-
- def testHourMinSec(self):
- timestr = "20051213141205"
-
- time = ipautil.parse_generalized_time(timestr)
- self.assertEqual(2005, time.year)
- self.assertEqual(12, time.month)
- self.assertEqual(13, time.day)
- self.assertEqual(14, time.hour)
- self.assertEqual(12, time.minute)
- self.assertEqual(5, time.second)
-
- def testFractions(self):
- timestr = "2003092208.5"
-
- time = ipautil.parse_generalized_time(timestr)
- self.assertEqual(2003, time.year)
- self.assertEqual(9, time.month)
- self.assertEqual(22, time.day)
- self.assertEqual(8, time.hour)
- self.assertEqual(30, time.minute)
- self.assertEqual(0, time.second)
-
- timestr = "199203301544,25"
-
- time = ipautil.parse_generalized_time(timestr)
- self.assertEqual(1992, time.year)
- self.assertEqual(3, time.month)
- self.assertEqual(30, time.day)
- self.assertEqual(15, time.hour)
- self.assertEqual(44, time.minute)
- self.assertEqual(15, time.second)
-
- timestr = "20060401185912,8"
-
- time = ipautil.parse_generalized_time(timestr)
- self.assertEqual(2006, time.year)
- self.assertEqual(4, time.month)
- self.assertEqual(1, time.day)
- self.assertEqual(18, time.hour)
- self.assertEqual(59, time.minute)
- self.assertEqual(12, time.second)
- self.assertEqual(800000, time.microsecond)
-
- def testTimeZones(self):
- timestr = "20051213141205Z"
-
- time = ipautil.parse_generalized_time(timestr)
- self.assertEqual(0, time.tzinfo.houroffset)
- self.assertEqual(0, time.tzinfo.minoffset)
- offset = time.tzinfo.utcoffset(time.tzinfo.dst())
- self.assertEqual(0, offset.seconds)
-
- timestr = "20051213141205+0500"
-
- time = ipautil.parse_generalized_time(timestr)
- self.assertEqual(5, time.tzinfo.houroffset)
- self.assertEqual(0, time.tzinfo.minoffset)
- offset = time.tzinfo.utcoffset(time.tzinfo.dst())
- self.assertEqual(5 * 60 * 60, offset.seconds)
-
- timestr = "20051213141205-0500"
-
- time = ipautil.parse_generalized_time(timestr)
- self.assertEqual(-5, time.tzinfo.houroffset)
- self.assertEqual(0, time.tzinfo.minoffset)
- # NOTE - the offset is always positive - it's minutes
- # _east_ of UTC
- offset = time.tzinfo.utcoffset(time.tzinfo.dst())
- self.assertEqual((24 - 5) * 60 * 60, offset.seconds)
-
- timestr = "20051213141205-0930"
-
- time = ipautil.parse_generalized_time(timestr)
- self.assertEqual(-9, time.tzinfo.houroffset)
- self.assertEqual(-30, time.tzinfo.minoffset)
- offset = time.tzinfo.utcoffset(time.tzinfo.dst())
- self.assertEqual(((24 - 9) * 60 * 60) - (30 * 60), offset.seconds)
-
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/ipatests/setup.py.in b/ipatests/setup.py.in
index afbe9abc..50220d76 100644
--- a/ipatests/setup.py.in
+++ b/ipatests/setup.py.in
@@ -72,7 +72,7 @@ def setup_package():
"ipatests.test_ipalib",
"ipatests.test_ipapython",
"ipatests.test_ipaserver",
- "ipatests.test_ipaserver.install",
+ "ipatests.test_ipaserver.test_install",
"ipatests.test_pkcs10",
"ipatests.test_webui",
"ipatests.test_xmlrpc"],
diff --git a/ipatests/test_ipapython/test_ipautil.py b/ipatests/test_ipapython/test_ipautil.py
index 650e1ce9..6783bd97 100644
--- a/ipatests/test_ipapython/test_ipautil.py
+++ b/ipatests/test_ipapython/test_ipautil.py
@@ -21,6 +21,7 @@ Test the `ipapython/ipautil.py` module.
"""
import nose
+import unittest
from ipapython import ipautil
@@ -67,3 +68,282 @@ def test_ip_address():
for addr in addrs:
yield (CheckIPAddress(addr[0]),) + addr
+
+
+class TestCIDict(unittest.TestCase):
+ def setUp(self):
+ self.cidict = ipautil.CIDict()
+ self.cidict["Key1"] = "val1"
+ self.cidict["key2"] = "val2"
+ self.cidict["KEY3"] = "VAL3"
+
+ def tearDown(self):
+ pass
+
+ def testLen(self):
+ self.assertEqual(3, len(self.cidict))
+
+ def test__GetItem(self):
+ self.assertEqual("val1", self.cidict["Key1"])
+ self.assertEqual("val1", self.cidict["key1"])
+ self.assertEqual("val2", self.cidict["KEY2"])
+ self.assertEqual("VAL3", self.cidict["key3"])
+ self.assertEqual("VAL3", self.cidict["KEY3"])
+ try:
+ self.cidict["key4"]
+ fail("should have raised KeyError")
+ except KeyError:
+ pass
+
+ def testGet(self):
+ self.assertEqual("val1", self.cidict.get("Key1"))
+ self.assertEqual("val1", self.cidict.get("key1"))
+ self.assertEqual("val2", self.cidict.get("KEY2"))
+ self.assertEqual("VAL3", self.cidict.get("key3"))
+ self.assertEqual("VAL3", self.cidict.get("KEY3"))
+ self.assertEqual("default", self.cidict.get("key4", "default"))
+
+ def test__SetItem(self):
+ self.cidict["key4"] = "val4"
+ self.assertEqual("val4", self.cidict["key4"])
+ self.cidict["KEY4"] = "newval4"
+ self.assertEqual("newval4", self.cidict["key4"])
+
+ def testDel(self):
+ self.assert_(self.cidict.has_key("Key1"))
+ del(self.cidict["Key1"])
+ self.failIf(self.cidict.has_key("Key1"))
+
+ self.assert_(self.cidict.has_key("key2"))
+ del(self.cidict["KEY2"])
+ self.failIf(self.cidict.has_key("key2"))
+
+ def testClear(self):
+ self.assertEqual(3, len(self.cidict))
+ self.cidict.clear()
+ self.assertEqual(0, len(self.cidict))
+
+ def testCopy(self):
+ """A copy is no longer a CIDict, but should preserve the case of
+ the keys as they were inserted."""
+ copy = self.cidict.copy()
+ self.assertEqual(3, len(copy))
+ self.assert_(copy.has_key("Key1"))
+ self.assertEqual("val1", copy["Key1"])
+ self.failIf(copy.has_key("key1"))
+
+ def testHasKey(self):
+ self.assert_(self.cidict.has_key("KEY1"))
+ self.assert_(self.cidict.has_key("key2"))
+ self.assert_(self.cidict.has_key("key3"))
+
+ def testItems(self):
+ items = self.cidict.items()
+ self.assertEqual(3, len(items))
+ items_set = set(items)
+ self.assert_(("Key1", "val1") in items_set)
+ self.assert_(("key2", "val2") in items_set)
+ self.assert_(("KEY3", "VAL3") in items_set)
+
+ def testIterItems(self):
+ items = []
+ for (k,v) in self.cidict.iteritems():
+ items.append((k,v))
+ self.assertEqual(3, len(items))
+ items_set = set(items)
+ self.assert_(("Key1", "val1") in items_set)
+ self.assert_(("key2", "val2") in items_set)
+ self.assert_(("KEY3", "VAL3") in items_set)
+
+ def testIterKeys(self):
+ keys = []
+ for k in self.cidict.iterkeys():
+ keys.append(k)
+ self.assertEqual(3, len(keys))
+ keys_set = set(keys)
+ self.assert_("Key1" in keys_set)
+ self.assert_("key2" in keys_set)
+ self.assert_("KEY3" in keys_set)
+
+ def testIterValues(self):
+ values = []
+ for k in self.cidict.itervalues():
+ values.append(k)
+ self.assertEqual(3, len(values))
+ values_set = set(values)
+ self.assert_("val1" in values_set)
+ self.assert_("val2" in values_set)
+ self.assert_("VAL3" in values_set)
+
+ def testKeys(self):
+ keys = self.cidict.keys()
+ self.assertEqual(3, len(keys))
+ keys_set = set(keys)
+ self.assert_("Key1" in keys_set)
+ self.assert_("key2" in keys_set)
+ self.assert_("KEY3" in keys_set)
+
+ def testValues(self):
+ values = self.cidict.values()
+ self.assertEqual(3, len(values))
+ values_set = set(values)
+ self.assert_("val1" in values_set)
+ self.assert_("val2" in values_set)
+ self.assert_("VAL3" in values_set)
+
+ def testUpdate(self):
+ newdict = { "KEY2": "newval2",
+ "key4": "val4" }
+ self.cidict.update(newdict)
+ self.assertEqual(4, len(self.cidict))
+
+ items = self.cidict.items()
+ self.assertEqual(4, len(items))
+ items_set = set(items)
+ self.assert_(("Key1", "val1") in items_set)
+ # note the update "overwrites" the case of the key2
+ self.assert_(("KEY2", "newval2") in items_set)
+ self.assert_(("KEY3", "VAL3") in items_set)
+ self.assert_(("key4", "val4") in items_set)
+
+ def testSetDefault(self):
+ self.assertEqual("val1", self.cidict.setdefault("KEY1", "default"))
+
+ self.failIf(self.cidict.has_key("KEY4"))
+ self.assertEqual("default", self.cidict.setdefault("KEY4", "default"))
+ self.assert_(self.cidict.has_key("KEY4"))
+ self.assertEqual("default", self.cidict["key4"])
+
+ self.failIf(self.cidict.has_key("KEY5"))
+ self.assertEqual(None, self.cidict.setdefault("KEY5"))
+ self.assert_(self.cidict.has_key("KEY5"))
+ self.assertEqual(None, self.cidict["key5"])
+
+ def testPop(self):
+ self.assertEqual("val1", self.cidict.pop("KEY1", "default"))
+ self.failIf(self.cidict.has_key("key1"))
+
+ self.assertEqual("val2", self.cidict.pop("KEY2"))
+ self.failIf(self.cidict.has_key("key2"))
+
+ self.assertEqual("default", self.cidict.pop("key4", "default"))
+ try:
+ self.cidict.pop("key4")
+ fail("should have raised KeyError")
+ except KeyError:
+ pass
+
+ def testPopItem(self):
+ items = set(self.cidict.items())
+ self.assertEqual(3, len(self.cidict))
+
+ item = self.cidict.popitem()
+ self.assertEqual(2, len(self.cidict))
+ self.assert_(item in items)
+ items.discard(item)
+
+ item = self.cidict.popitem()
+ self.assertEqual(1, len(self.cidict))
+ self.assert_(item in items)
+ items.discard(item)
+
+ item = self.cidict.popitem()
+ self.assertEqual(0, len(self.cidict))
+ self.assert_(item in items)
+ items.discard(item)
+
+class TestTimeParser(unittest.TestCase):
+ def setUp(self):
+ pass
+
+ def tearDown(self):
+ pass
+
+ def testSimple(self):
+ timestr = "20070803"
+
+ time = ipautil.parse_generalized_time(timestr)
+ self.assertEqual(2007, time.year)
+ self.assertEqual(8, time.month)
+ self.assertEqual(3, time.day)
+ self.assertEqual(0, time.hour)
+ self.assertEqual(0, time.minute)
+ self.assertEqual(0, time.second)
+
+ def testHourMinSec(self):
+ timestr = "20051213141205"
+
+ time = ipautil.parse_generalized_time(timestr)
+ self.assertEqual(2005, time.year)
+ self.assertEqual(12, time.month)
+ self.assertEqual(13, time.day)
+ self.assertEqual(14, time.hour)
+ self.assertEqual(12, time.minute)
+ self.assertEqual(5, time.second)
+
+ def testFractions(self):
+ timestr = "2003092208.5"
+
+ time = ipautil.parse_generalized_time(timestr)
+ self.assertEqual(2003, time.year)
+ self.assertEqual(9, time.month)
+ self.assertEqual(22, time.day)
+ self.assertEqual(8, time.hour)
+ self.assertEqual(30, time.minute)
+ self.assertEqual(0, time.second)
+
+ timestr = "199203301544,25"
+
+ time = ipautil.parse_generalized_time(timestr)
+ self.assertEqual(1992, time.year)
+ self.assertEqual(3, time.month)
+ self.assertEqual(30, time.day)
+ self.assertEqual(15, time.hour)
+ self.assertEqual(44, time.minute)
+ self.assertEqual(15, time.second)
+
+ timestr = "20060401185912,8"
+
+ time = ipautil.parse_generalized_time(timestr)
+ self.assertEqual(2006, time.year)
+ self.assertEqual(4, time.month)
+ self.assertEqual(1, time.day)
+ self.assertEqual(18, time.hour)
+ self.assertEqual(59, time.minute)
+ self.assertEqual(12, time.second)
+ self.assertEqual(800000, time.microsecond)
+
+ def testTimeZones(self):
+ timestr = "20051213141205Z"
+
+ time = ipautil.parse_generalized_time(timestr)
+ self.assertEqual(0, time.tzinfo.houroffset)
+ self.assertEqual(0, time.tzinfo.minoffset)
+ offset = time.tzinfo.utcoffset(time.tzinfo.dst())
+ self.assertEqual(0, offset.seconds)
+
+ timestr = "20051213141205+0500"
+
+ time = ipautil.parse_generalized_time(timestr)
+ self.assertEqual(5, time.tzinfo.houroffset)
+ self.assertEqual(0, time.tzinfo.minoffset)
+ offset = time.tzinfo.utcoffset(time.tzinfo.dst())
+ self.assertEqual(5 * 60 * 60, offset.seconds)
+
+ timestr = "20051213141205-0500"
+
+ time = ipautil.parse_generalized_time(timestr)
+ self.assertEqual(-5, time.tzinfo.houroffset)
+ self.assertEqual(0, time.tzinfo.minoffset)
+ # NOTE - the offset is always positive - it's minutes
+ # _east_ of UTC
+ offset = time.tzinfo.utcoffset(time.tzinfo.dst())
+ self.assertEqual((24 - 5) * 60 * 60, offset.seconds)
+
+ timestr = "20051213141205-0930"
+
+ time = ipautil.parse_generalized_time(timestr)
+ self.assertEqual(-9, time.tzinfo.houroffset)
+ self.assertEqual(-30, time.tzinfo.minoffset)
+ offset = time.tzinfo.utcoffset(time.tzinfo.dst())
+ self.assertEqual(((24 - 9) * 60 * 60) - (30 * 60), offset.seconds)
diff --git a/ipapython/test/test_ipavalidate.py b/ipatests/test_ipapython/test_ipavalidate.py
index 12b1577b..12b1577b 100644
--- a/ipapython/test/test_ipavalidate.py
+++ b/ipatests/test_ipapython/test_ipavalidate.py
diff --git a/ipatests/test_ipaserver/install/test_adtrustinstance.py b/ipatests/test_ipaserver/test_install/test_adtrustinstance.py
index 9a62f87c..9a62f87c 100755
--- a/ipatests/test_ipaserver/install/test_adtrustinstance.py
+++ b/ipatests/test_ipaserver/test_install/test_adtrustinstance.py