dirsrvtests/tests/tickets/ticket48497_test.py | 3 +--
dirsrvtests/tests/tickets/ticket48745_test.py | 3 +--
dirsrvtests/tests/tickets/ticket48746_test.py | 6 ++----
3 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit cf11faef091663b2cf52da1e04441d9cb735c42b
Author: Simon Pichugin <spichugi(a)redhat.com>
Date: Wed Nov 9 10:10:51 2016 +0100
Ticket 49024 - Fix the rest of the CI failures
Description: Change errors log paths to the ones from paths.py module.
The rest of the test cases, that failed on CI, passed for me on
the latest version of fedora 389-ds-base package built from master.
https://fedorahosted.org/389/ticket/49024
Reviewed by: mreynolds (Thanks!)
diff --git a/dirsrvtests/tests/tickets/ticket48497_test.py
b/dirsrvtests/tests/tickets/ticket48497_test.py
index 3130fc4..d8141d5 100644
--- a/dirsrvtests/tests/tickets/ticket48497_test.py
+++ b/dirsrvtests/tests/tickets/ticket48497_test.py
@@ -135,8 +135,7 @@ def test_ticket48497_homeDirectory_index_run(topology):
topology.standalone.tasks.reindex(suffix=SUFFIX, attrname='homeDirectory',
args=args)
log.info("Check indexing succeeded with a specified matching rule")
- file_path = os.path.join(topology.standalone.prefix,
"var/log/dirsrv/slapd-%s/errors" % topology.standalone.serverid)
- file_obj = open(file_path, "r")
+ file_obj = open(topology.standalone.errlog, "r")
# Check if the MR configuration failure occurs
regex = re.compile("unknown or invalid matching rule")
diff --git a/dirsrvtests/tests/tickets/ticket48745_test.py
b/dirsrvtests/tests/tickets/ticket48745_test.py
index 4c23d04..6a0c7f0 100644
--- a/dirsrvtests/tests/tickets/ticket48745_test.py
+++ b/dirsrvtests/tests/tickets/ticket48745_test.py
@@ -106,8 +106,7 @@ def test_ticket48745_homeDirectory_indexed_cis(topology):
topology.standalone.tasks.reindex(suffix=SUFFIX, attrname='homeDirectory',
args=args)
log.info("Check indexing succeeded with a specified matching rule")
- file_path = os.path.join(topology.standalone.prefix,
"var/log/dirsrv/slapd-%s/errors" % topology.standalone.serverid)
- file_obj = open(file_path, "r")
+ file_obj = open(topology.standalone.errlog, "r")
# Check if the MR configuration failure occurs
regex = re.compile("unknown or invalid matching rule")
diff --git a/dirsrvtests/tests/tickets/ticket48746_test.py
b/dirsrvtests/tests/tickets/ticket48746_test.py
index 401b300..0a13998 100644
--- a/dirsrvtests/tests/tickets/ticket48746_test.py
+++ b/dirsrvtests/tests/tickets/ticket48746_test.py
@@ -104,8 +104,7 @@ def test_ticket48746_homeDirectory_indexed_cis(topology):
topology.standalone.tasks.reindex(suffix=SUFFIX, attrname='homeDirectory',
args=args)
log.info("Check indexing succeeded with a specified matching rule")
- file_path = os.path.join(topology.standalone.prefix,
"var/log/dirsrv/slapd-%s/errors" % topology.standalone.serverid)
- file_obj = open(file_path, "r")
+ file_obj = open(topology.standalone.errlog, "r")
# Check if the MR configuration failure occurs
regex = re.compile("unknown or invalid matching rule")
@@ -168,8 +167,7 @@ def test_ticket48746_homeDirectory_indexed_ces(topology):
topology.standalone.tasks.reindex(suffix=SUFFIX, attrname='homeDirectory',
args=args)
log.info("Check indexing succeeded with a specified matching rule")
- file_path = os.path.join(topology.standalone.prefix,
"var/log/dirsrv/slapd-%s/errors" % topology.standalone.serverid)
- file_obj = open(file_path, "r")
+ file_obj = open(topology.standalone.errlog, "r")
# Check if the MR configuration failure occurs
regex = re.compile("unknown or invalid matching rule")