| |
@@ -124,11 +124,17 @@
|
| |
|
| |
cachesize = '33333333'
|
| |
|
| |
- dbcachesize_val = bdb_config_ldbm.get_attr_val('nsslapd-dbcachesize')
|
| |
+ if ds_is_older('1.4.2'):
|
| |
+ dbcachesize_val = config_ldbm.get_attr_val('nsslapd-dbcachesize')
|
| |
+ autosize_val = config_ldbm.get_attr_val('nsslapd-cache-autosize')
|
| |
+ autosize_split_val = config_ldbm.get_attr_val('nsslapd-cache-autosize-split')
|
| |
+ else:
|
| |
+ dbcachesize_val = bdb_config_ldbm.get_attr_val('nsslapd-dbcachesize')
|
| |
+ autosize_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize')
|
| |
+ autosize_split_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize-split')
|
| |
+
|
| |
cachenensize_val = userroot_ldbm.get_attr_val('nsslapd-cachememsize')
|
| |
dncachenensize_val = userroot_ldbm.get_attr_val('nsslapd-dncachememsize')
|
| |
- autosize_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize')
|
| |
- autosize_split_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize-split')
|
| |
|
| |
log.info("Check nsslapd-dbcachesize and nsslapd-cachememsize before the test")
|
| |
log.info("nsslapd-dbcachesize == {}".format(dbcachesize_val))
|
| |
@@ -165,11 +171,17 @@
|
| |
config_ldbm.set('nsslapd-dbcachesize ', cachesize)
|
| |
topo.standalone.restart()
|
| |
|
| |
- dbcachesize_val = bdb_config_ldbm.get_attr_val('nsslapd-dbcachesize')
|
| |
+ if ds_is_older('1.4.2'):
|
| |
+ dbcachesize_val = config_ldbm.get_attr_val('nsslapd-dbcachesize')
|
| |
+ autosize_val = config_ldbm.get_attr_val('nsslapd-cache-autosize')
|
| |
+ autosize_split_val = config_ldbm.get_attr_val('nsslapd-cache-autosize-split')
|
| |
+ else:
|
| |
+ dbcachesize_val = bdb_config_ldbm.get_attr_val('nsslapd-dbcachesize')
|
| |
+ autosize_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize')
|
| |
+ autosize_split_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize-split')
|
| |
+
|
| |
cachenensize_val = userroot_ldbm.get_attr_val('nsslapd-cachememsize')
|
| |
dncachenensize_val = userroot_ldbm.get_attr_val('nsslapd-dncachememsize')
|
| |
- autosize_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize')
|
| |
- autosize_split_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize-split')
|
| |
|
| |
log.info("Check nsslapd-dbcachesize and nsslapd-cachememsize in the appropriate range.")
|
| |
log.info("nsslapd-dbcachesize == {}".format(dbcachesize_val))
|
| |
@@ -215,11 +227,17 @@
|
| |
|
| |
# Test with caches with both real values and 0
|
| |
for cachesize in ('0', '33333333'):
|
| |
- dbcachesize_val = bdb_config_ldbm.get_attr_val('nsslapd-dbcachesize')
|
| |
+ if ds_is_older('1.4.2'):
|
| |
+ dbcachesize_val = config_ldbm.get_attr_val('nsslapd-dbcachesize')
|
| |
+ autosize_val = config_ldbm.get_attr_val('nsslapd-cache-autosize')
|
| |
+ autosize_split_val = config_ldbm.get_attr_val('nsslapd-cache-autosize-split')
|
| |
+ else:
|
| |
+ dbcachesize_val = bdb_config_ldbm.get_attr_val('nsslapd-dbcachesize')
|
| |
+ autosize_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize')
|
| |
+ autosize_split_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize-split')
|
| |
+
|
| |
cachenensize_val = userroot_ldbm.get_attr_val('nsslapd-cachememsize')
|
| |
dncachenensize_val = userroot_ldbm.get_attr_val('nsslapd-dncachememsize')
|
| |
- autosize_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize')
|
| |
- autosize_split_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize-split')
|
| |
|
| |
log.info("Check nsslapd-dbcachesize and nsslapd-cachememsize before the test")
|
| |
log.info("nsslapd-dbcachesize == {}".format(dbcachesize_val))
|
| |
@@ -243,11 +261,17 @@
|
| |
userroot_ldbm.set('nsslapd-cachememsize', cachesize)
|
| |
topo.standalone.restart()
|
| |
|
| |
- dbcachesize_val = bdb_config_ldbm.get_attr_val('nsslapd-dbcachesize')
|
| |
+ if ds_is_older('1.4.2'):
|
| |
+ dbcachesize_val = config_ldbm.get_attr_val('nsslapd-dbcachesize')
|
| |
+ autosize_val = config_ldbm.get_attr_val('nsslapd-cache-autosize')
|
| |
+ autosize_split_val = config_ldbm.get_attr_val('nsslapd-cache-autosize-split')
|
| |
+ else:
|
| |
+ dbcachesize_val = bdb_config_ldbm.get_attr_val('nsslapd-dbcachesize')
|
| |
+ autosize_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize')
|
| |
+ autosize_split_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize-split')
|
| |
+
|
| |
cachenensize_val = userroot_ldbm.get_attr_val('nsslapd-cachememsize')
|
| |
dncachenensize_val = userroot_ldbm.get_attr_val('nsslapd-dncachememsize')
|
| |
- autosize_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize')
|
| |
- autosize_split_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize-split')
|
| |
|
| |
log.info("Check nsslapd-dbcachesize and nsslapd-cachememsize in the appropriate range.")
|
| |
log.info("nsslapd-dbcachesize == {}".format(dbcachesize_val))
|
| |
@@ -280,8 +304,12 @@
|
| |
|
| |
config_ldbm = DSLdapObject(topo.standalone, DN_CONFIG_LDBM)
|
| |
bdb_config_ldbm = DSLdapObject(topo.standalone, DN_CONFIG_LDBM_BDB)
|
| |
- autosize_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize')
|
| |
- autosize_split_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize-split')
|
| |
+ if ds_is_older('1.4.2'):
|
| |
+ autosize_val = config_ldbm.get_attr_val('nsslapd-cache-autosize')
|
| |
+ autosize_split_val = config_ldbm.get_attr_val('nsslapd-cache-autosize-split')
|
| |
+ else:
|
| |
+ autosize_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize')
|
| |
+ autosize_split_val = bdb_config_ldbm.get_attr_val('nsslapd-cache-autosize-split')
|
| |
|
| |
log.info("Set nsslapd-cache-autosize-split to {}".format(invalid_value))
|
| |
with pytest.raises(ldap.UNWILLING_TO_PERFORM):
|
| |
Description:
Fix various test issues on RHEL7 and RHEL8:
systemd on RHEL7 doesn't have --value option.
Drop --value option and parse the output manually.
Use newer BDB config only on 1.4.2+.
Skip tests/suites/password/pbkdf2_upgrade_plugin_test.py on <1.4.1.
Unhashed passwords are not logged by default only on 1.4.1.6+.
String literal comparison doesn't work with double digits,
i.e. '1.3.10.1' > '1.3.2.1' returns False.
Use packaging.version to compare versions.
Don't use nsAccount objectClass on versions <=1.4.x.
Update skipif/xfail version to match downstream versions too.
Relates: https://pagure.io/389-ds-base/issue/49761