This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch master
in repository 389-ds-base.
commit f3428812407e1e7efc97bc12c8abb0581ef2e89b
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Thu Sep 7 10:34:42 2017 -0400
Ticket 49295 - Fix CI test for account policy
Description: Adjust timing, again, in account policy test.
Don't use verbose logging in ticket47653MMR_test as
it throws off the timing as well.
https://pagure.io/389-ds-base/issue/49295
Reviewed by: mreynolds(one line commit rule)
---
dirsrvtests/tests/suites/plugins/accpol_test.py | 5 ++++-
dirsrvtests/tests/tickets/ticket47653MMR_test.py | 11 +++++++----
dirsrvtests/tests/tickets/ticket49303_test.py | 3 +--
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/dirsrvtests/tests/suites/plugins/accpol_test.py
b/dirsrvtests/tests/suites/plugins/accpol_test.py
index 9e1a8c0..2539bc0 100644
--- a/dirsrvtests/tests/suites/plugins/accpol_test.py
+++ b/dirsrvtests/tests/suites/plugins/accpol_test.py
@@ -817,16 +817,19 @@ def test_glnact_pwexp(topology_st, accpol_global):
# Allow password to expire again, but inactivity continues
time.sleep(7)
+
# reset password to counter expiration, we will test expiration again later
userpw_reset(topology_st, suffix, subtree, userid, nousrs, "DirMgr",
PASSWORD, USER_PASW)
log.info('Sleep for 4 secs and check if account is now inactivated, expected
error 19')
time.sleep(4)
account_status(topology_st, suffix, subtree, userid, nousrs, 0,
"Disabled")
+ userpw_reset(topology_st, suffix, subtree, userid, nousrs, "DirMgr",
PASSWORD, USER_PASW)
+ account_status(topology_st, suffix, subtree, userid, nousrs, 0,
"Disabled")
# Reset inactivity and check for expiration
add_time_attr(topology_st, suffix, subtree, userid, nousrs, 'lastLoginTime')
account_status(topology_st, suffix, subtree, userid, nousrs, 0, "Enabled")
- time.sleep(4)
+ time.sleep(8)
account_status(topology_st, suffix, subtree, userid, nousrs, 0, "Expired")
# Reset account
diff --git a/dirsrvtests/tests/tickets/ticket47653MMR_test.py
b/dirsrvtests/tests/tickets/ticket47653MMR_test.py
index fa6f69a..6f6a5d4 100644
--- a/dirsrvtests/tests/tickets/ticket47653MMR_test.py
+++ b/dirsrvtests/tests/tickets/ticket47653MMR_test.py
@@ -27,6 +27,8 @@ from lib389.utils import *
pytestmark = pytest.mark.skipif(ds_is_older('1.3.2'), reason="Not
implemented")
log = logging.getLogger(__name__)
+DEBUGGING = os.getenv("DEBUGGING", default=False)
+
TEST_REPL_DN = "cn=test_repl, %s" % SUFFIX
OC_NAME = 'OCticket47653'
MUST = "(postalAddress $ postalCode)"
@@ -78,10 +80,11 @@ def test_ticket47653_init(topology_m2):
'cn': BIND_NAME,
'userpassword': BIND_PW})))
- # enable acl error logging
- mod = [(ldap.MOD_REPLACE, 'nsslapd-errorlog-level', str(128 + 8192))] # ACL
+ REPL
- topology_m2.ms["master1"].modify_s(DN_CONFIG, mod)
- topology_m2.ms["master2"].modify_s(DN_CONFIG, mod)
+ if DEBUGGING:
+ # enable acl error logging
+ mod = [(ldap.MOD_REPLACE, 'nsslapd-errorlog-level', str(128 + 8192))] #
ACL + REPL
+ topology_m2.ms["master1"].modify_s(DN_CONFIG, mod)
+ topology_m2.ms["master2"].modify_s(DN_CONFIG, mod)
# remove all aci's and start with a clean slate
mod = [(ldap.MOD_DELETE, 'aci', None)]
diff --git a/dirsrvtests/tests/tickets/ticket49303_test.py
b/dirsrvtests/tests/tickets/ticket49303_test.py
index a61d8cd..89972a9 100644
--- a/dirsrvtests/tests/tickets/ticket49303_test.py
+++ b/dirsrvtests/tests/tickets/ticket49303_test.py
@@ -62,8 +62,7 @@ def enable_ssl(server, ldapsport):
server.rsa.create()
server.config.set('nsslapd-secureport', '%s' % ldapsport)
server.config.set('nsslapd-security', 'on')
-
- time.sleep(1)
+ server.sslport = SECUREPORT_STANDALONE1
server.restart()
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.