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 706a1b971fb363e9396eab7815ff8aa5407ea0f8
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Thu Jul 6 10:48:04 2017 -0400
Ticket 49295 - Fix CI tests
Description: Fix CI tests broken by new lib389 version, and other misc fixes.
https://pagure.io/389-ds-base/issue/49295
Reviewed by: wibrown(Thanks!)
---
.../suites/dynamic_plugins/dynamic_plugins_test.py | 17 ++++++++---------
.../tests/suites/dynamic_plugins/plugin_tests.py | 8 +++-----
dirsrvtests/tests/tickets/ticket48226_test.py | 2 +-
dirsrvtests/tests/tickets/ticket48759_test.py | 2 +-
dirsrvtests/tests/tickets/ticket48944_test.py | 4 ++--
5 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/dirsrvtests/tests/suites/dynamic_plugins/dynamic_plugins_test.py
b/dirsrvtests/tests/suites/dynamic_plugins/dynamic_plugins_test.py
index 234f685..ea1dafb 100644
--- a/dirsrvtests/tests/suites/dynamic_plugins/dynamic_plugins_test.py
+++ b/dirsrvtests/tests/suites/dynamic_plugins/dynamic_plugins_test.py
@@ -16,16 +16,17 @@ import logging
import ldap.sasl
import pytest
from lib389.tasks import *
-
+from lib389 import DirSrv
+from lib389.properties import *
import plugin_tests
import stress_tests
from lib389.topologies import topology_st
-from lib389._constants import (DN_CONFIG, DEFAULT_SUFFIX, DN_LDBM, PLUGIN_ACCT_POLICY,
- PLUGIN_MEMBER_OF, PLUGIN_LINKED_ATTRS,
PLUGIN_REFER_INTEGRITY,
- REPLICAROLE_MASTER, REPLICAROLE_CONSUMER,
REPLICATION_BIND_DN,
- REPLICATION_BIND_PW, REPLICATION_BIND_METHOD,
REPLICATION_TRANSPORT,
- LOCALHOST, REPLICA_RUV_FILTER,
- RA_NAME, RA_BINDDN, RA_BINDPW, RA_METHOD,
RA_TRANSPORT_PROT)
+from lib389._constants import (DN_CONFIG, DEFAULT_SUFFIX, DN_LDBM, defaultProperties,
+ PLUGIN_MEMBER_OF, PLUGIN_LINKED_ATTRS,
PLUGIN_REFER_INTEGRITY,
+ REPLICAROLE_MASTER, REPLICAROLE_CONSUMER,
REPLICATION_BIND_DN,
+ REPLICATION_BIND_PW, REPLICATION_BIND_METHOD,
REPLICATION_TRANSPORT,
+ LOCALHOST, REPLICA_RUV_FILTER, args_instance,
+ RA_NAME, RA_BINDDN, RA_BINDPW, RA_METHOD,
RA_TRANSPORT_PROT)
log = logging.getLogger(__name__)
@@ -292,7 +293,6 @@ def test_dynamic_plugins(topology_st):
RA_BINDPW: defaultProperties[REPLICATION_BIND_PW],
RA_METHOD: defaultProperties[REPLICATION_BIND_METHOD],
RA_TRANSPORT_PROT:
defaultProperties[REPLICATION_TRANSPORT]}
-
repl_agreement =
topology_st.standalone.agreement.create(suffix=DEFAULT_SUFFIX,
host=LOCALHOST,
port=REPLICA_PORT,
@@ -301,7 +301,6 @@ def test_dynamic_plugins(topology_st):
if not repl_agreement:
log.fatal("Fail to create a replica agreement")
repl_fail(replica_inst)
-
topology_st.standalone.agreement.init(DEFAULT_SUFFIX, LOCALHOST,
REPLICA_PORT)
topology_st.standalone.waitForReplInit(repl_agreement)
except:
diff --git a/dirsrvtests/tests/suites/dynamic_plugins/plugin_tests.py
b/dirsrvtests/tests/suites/dynamic_plugins/plugin_tests.py
index f17ec53..e35b98b 100644
--- a/dirsrvtests/tests/suites/dynamic_plugins/plugin_tests.py
+++ b/dirsrvtests/tests/suites/dynamic_plugins/plugin_tests.py
@@ -12,17 +12,15 @@ Created on Dec 09, 2014
@author: mreynolds
'''
import logging
-
from lib389 import DirSrv
-
from lib389.tasks import *
-
+from lib389.properties import *
from lib389._constants import (DEFAULT_SUFFIX, PLUGIN_ACCT_USABILITY,
PLUGIN_ACCT_POLICY,
PLUGIN_ATTR_UNIQUENESS, PLUGIN_AUTOMEMBER, PLUGIN_DNA,
- PLUGIN_LINKED_ATTRS, PLUGIN_MEMBER_OF,
+ PLUGIN_LINKED_ATTRS, PLUGIN_MEMBER_OF, DN_CONFIG,
PLUGIN_MANAGED_ENTRY, PLUGIN_PASSTHRU,
PLUGIN_REFER_INTEGRITY,
PLUGIN_RETRO_CHANGELOG, PLUGIN_ROOTDN_ACCESS, DN_DM,
PASSWORD,
- LOCALHOST)
+ LOCALHOST, RETROCL_SUFFIX, args_instance)
log = logging.getLogger(__name__)
diff --git a/dirsrvtests/tests/tickets/ticket48226_test.py
b/dirsrvtests/tests/tickets/ticket48226_test.py
index cbc418b..8b2b504 100644
--- a/dirsrvtests/tests/tickets/ticket48226_test.py
+++ b/dirsrvtests/tests/tickets/ticket48226_test.py
@@ -12,7 +12,7 @@ from lib389.utils import *
from lib389.topologies import topology_m2
from lib389._constants import (DEFAULT_SUFFIX, REPLICA_PURGE_DELAY,
REPLICA_PURGE_INTERVAL, DN_CONFIG,
- SUFFIX, VALGRIND_LEAK_STR)
+ SUFFIX, VALGRIND_LEAK_STR, VALGRIND_INVALID_STR)
logging.getLogger(__name__).setLevel(logging.DEBUG)
log = logging.getLogger(__name__)
diff --git a/dirsrvtests/tests/tickets/ticket48759_test.py
b/dirsrvtests/tests/tickets/ticket48759_test.py
index a829ef6..3406a78 100644
--- a/dirsrvtests/tests/tickets/ticket48759_test.py
+++ b/dirsrvtests/tests/tickets/ticket48759_test.py
@@ -13,7 +13,7 @@ from lib389.tasks import *
from lib389.topologies import topology_st
from lib389._constants import (PLUGIN_MEMBER_OF, DEFAULT_SUFFIX, REPLICAROLE_MASTER,
REPLICAID_MASTER_1,
- DN_CONFIG, PLUGIN_RETRO_CHANGELOG,
REPLICA_PRECISE_PURGING)
+ DN_CONFIG, PLUGIN_RETRO_CHANGELOG, REPLICA_PRECISE_PURGING,
REPLICA_PURGE_DELAY)
log = logging.getLogger(__name__)
diff --git a/dirsrvtests/tests/tickets/ticket48944_test.py
b/dirsrvtests/tests/tickets/ticket48944_test.py
index 21dd3c3..b933cdd 100644
--- a/dirsrvtests/tests/tickets/ticket48944_test.py
+++ b/dirsrvtests/tests/tickets/ticket48944_test.py
@@ -176,7 +176,7 @@ def test_ticket48944(topo):
lastLogin_c2_2 = _last_login_time(topo, tuserdn, 'consumer2',
'bind_n_check')
assert lastLogin_c2_2 > lastLogin_m2_1
- time.sleep(5)
+ time.sleep(10) # Allow replication to kick in
lastLogin_m2_2 = _last_login_time(topo, tuserdn, 'master2', 'check')
assert lastLogin_m2_2 == lastLogin_m2_1
@@ -191,7 +191,7 @@ def test_ticket48944(topo):
log.info('Check if lastLoginTime update from master2 is synced to all masters and
consumers')
lastLogin_m2_3 = _last_login_time(topo, tuserdn, 'master2',
'bind_n_check')
- time.sleep(2)
+ time.sleep(10) # Allow replication to kick in
lastLogin_m1_2 = _last_login_time(topo, tuserdn, 'master1', 'check')
lastLogin_c1_4 = _last_login_time(topo, tuserdn, 'consumer1',
'check')
lastLogin_c2_4 = _last_login_time(topo, tuserdn, 'consumer2',
'check')
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.