Merge branch 'main' into cli-mon-mdb

.gitignore

@@ -240,3 +240,4 @@ vendor.tar.gz
 /rust-nsslapd-private.h
 /rust-slapi-private.h
 /src/lib389/setup.py
+/src/target

dirsrvtests/tests/suites/clu/dsctl_acceptance_test.py

@@ -11,11 +11,10 @@
 import os
 import time
 from lib389.topologies import topology_st as topo
+from lib389.paths import Paths
 
 log = logging.getLogger(__name__)
 
-#unstable or unstatus tests, skipped for now
-@pytest.mark.flaky(max_runs=2, min_passes=1)
 def test_custom_path(topo):
     """Test that a custom path, backup directory, is correctly used by lib389
     when the server is stopped.
@@ -45,9 +44,13 @@ def test_custom_path(topo):
     time.sleep(.5)
 
     # Stop the server and take a backup
-    topo.standalone.stop()
+    inst = topo.standalone
+    inst.stop()
+    # Refresh ds_paths
+    inst.ds_paths = Paths(inst.serverid, instance=inst, local=inst.isLocal)
+
     time.sleep(.5)
-    topo.standalone.db2bak(None)  # Bug, bak dir is being pulled from defaults.inf, and not from config
+    inst.db2bak(None)  # Bug, bak dir is being pulled from defaults.inf, and not from config
 
     # Verify backup was written to LDIF directory
     log.info("AFTER: ldif dir (new bak dir): " + ldif_dir + " items: " + str(len(os.listdir(ldif_dir))))

dirsrvtests/tests/suites/clu/dsctl_dblib_test.py

@@ -13,7 +13,11 @@
 import time
 from lib389._constants import DEFAULT_SUFFIX
 from lib389.backend import DatabaseConfig
-from lib389.cli_ctl.dblib import (FakeArgs, dblib_bdb2mdb, dblib_mdb2bdb, dblib_cleanup)
+from lib389.cli_ctl.dblib import (
+    FakeArgs,
+    dblib_bdb2mdb,
+    dblib_cleanup,
+    is_bdb_supported)
 from lib389.idm.user import UserAccounts
 from lib389.replica import ReplicationManager
 from lib389.topologies import topology_m2 as topo_m2, topology_st as topo_st
@@ -87,6 +91,7 @@ def _check_db(inst, log, impl):
         assert db_files == mdb_list
 
 
+@pytest.mark.skipif(is_bdb_supported() is False, reason='This test requires bdb support')
 def test_dblib_migration(init_user):
     """
     Verify dsctl dblib xxxxxxx sub commands (migration between bdb and lmdb)