From e7f0ec9e113476f5ff3c18eec53d7b8d110b1398 Mon Sep 17 00:00:00 2001
From: Viktor Ashirov <vashirov@redhat.com>
Date: Nov 14 2019 18:22:33 +0000
Subject: Issue 49761 - Fix CI test suite issues


Description:
Fix few more issues around version detection.

Relates: https://pagure.io/389-ds-base/issue/49761

Reviewed by: mreynolds (Thanks!)

---

diff --git a/dirsrvtests/tests/suites/ds_logs/ds_logs_test.py b/dirsrvtests/tests/suites/ds_logs/ds_logs_test.py
index 2306cb9..94686f5 100644
--- a/dirsrvtests/tests/suites/ds_logs/ds_logs_test.py
+++ b/dirsrvtests/tests/suites/ds_logs/ds_logs_test.py
@@ -790,7 +790,7 @@ def test_log_base_dn_when_invalid_attr_request(topology_st):
     assert topology_st.standalone.ds_access_log.match(r'.*SRCH base="{}".*'.format(DEFAULT_SUFFIX))
 
 
-@pytest.mark.xfail(ds_is_older('1.3.8'), reason="May fail because of bug 1676948")
+@pytest.mark.xfail(ds_is_older('1.3.8', '1.4.2'), reason="May fail because of bug 1676948")
 @pytest.mark.bz1676948
 @pytest.mark.ds50536
 def test_audit_log_rotate_and_check_string(topology_st, clean_access_logs, set_audit_log_config_values_to_rotate):
diff --git a/dirsrvtests/tests/suites/mapping_tree/referral_during_tot_init_test.py b/dirsrvtests/tests/suites/mapping_tree/referral_during_tot_init_test.py
index 24a0855..730969a 100644
--- a/dirsrvtests/tests/suites/mapping_tree/referral_during_tot_init_test.py
+++ b/dirsrvtests/tests/suites/mapping_tree/referral_during_tot_init_test.py
@@ -15,6 +15,7 @@ from lib389.agreement import Agreements
 from lib389.idm.user import (TEST_USER_PROPERTIES, UserAccounts)
 
 from lib389.dbgen import dbgen
+from lib389.utils import ds_is_older
 
 pytestmark = pytest.mark.tier1
 
diff --git a/src/lib389/lib389/utils.py b/src/lib389/lib389/utils.py
index a6780d1..3234cdc 100644
--- a/src/lib389/lib389/utils.py
+++ b/src/lib389/lib389/utils.py
@@ -1077,7 +1077,7 @@ def ds_is_related(relation, *ver):
     if len(ver) > 1:
         for cmp_ver in ver:
             if cmp_ver.startswith(ds_ver[:3]):
-                return ops[relation](version.parse(ds_ver),version.parse(cmp_ver))
+                return ops[relation](LegacyVersion(ds_ver),LegacyVersion(cmp_ver))
     else:
         return ops[relation](LegacyVersion(ds_ver), LegacyVersion(ver[0]))