[389-ds-base] branch master updated (a51026f -> 56055da)

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

vashirov pushed a change to branch master
in repository 389-ds-base.

from  a51026f   Issue 49156 - Clean up test suites dir structure and docstrings
       new  56055da   Issue 49159 - test_schema_comparewithfiles fails with python-ldap>=2.4.26

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.

Summary of changes:
 dirsrvtests/tests/suites/schema/test_schema.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

[389-ds-base] 01/01: Issue 49159 - test_schema_comparewithfiles fails with python-ldap>=2.4.26

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

vashirov pushed a commit to branch master
in repository 389-ds-base.

commit 56055da0fde15d199d8d2c48e934c44444f42ea6
Author: Viktor Ashirov 
Date:   Tue Mar 7 03:32:11 2017 +0100

Issue 49159 - test_schema_comparewithfiles fails with python-ldap>=2.4.26

Bug Description:
    comparewithfiles test from Schema test suite fails on 99user.ldif
    with newer versions of python-ldap (2.4.26 and higher).

Fix Description:
    Handle exception gracefully.

https://pagure.io/389-ds-base/issue/49159

Reviewed by: mreynolds (Thanks!)
---
 dirsrvtests/tests/suites/schema/test_schema.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dirsrvtests/tests/suites/schema/test_schema.py b/dirsrvtests/tests/suites/schema/test_schema.py
index 123d6fc..10838f1 100644
--- a/dirsrvtests/tests/suites/schema/test_schema.py
+++ b/dirsrvtests/tests/suites/schema/test_schema.py
@@ -127,11 +127,10 @@ def test_schema_comparewithfiles(topology_st):
     ldschema = schemainst.schema.get_subschema()
     assert ldschema
     for fn in schemainst.schema.list_files():
-        fschema = schemainst.schema.file_to_subschema(fn)
-        if not fschema:
+        try:
+            fschema = schemainst.schema.file_to_subschema(fn)
+        except:
             log.warn("Unable to parse %s as a schema file - skipping" % fn)
-            continue
-        assert fschema
         for oid in fschema.listall(occlass):
             se = fschema.get_obj(occlass, oid)
             assert se