Skip to content

Commit

Permalink
Fix Pierre's comments
Browse files Browse the repository at this point in the history
  • Loading branch information
droideck committed Dec 23, 2024
1 parent 3603e54 commit 802fb91
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#
import pytest
from lib389.topologies import topology_st
from lib389.password_plugins import PBKDF2SHA512Plugin
from lib389.password_plugins import PBKDF2SHA256Plugin
from lib389.utils import ds_is_older

pytestmark = pytest.mark.tier1
Expand All @@ -35,18 +35,18 @@ def test_pbkdf2_upgrade(topology_st):
"""
# Remove the pbkdf2 plugin config
p1 = PBKDF2SHA512Plugin(topology_st.standalone)
p1 = PBKDF2SHA256Plugin(topology_st.standalone)
assert(p1.exists())
p1._protected = False
p1.delete()
# Restart
topology_st.standalone.restart()
# check it's been readded.
p2 = PBKDF2SHA512Plugin(topology_st.standalone)
p2 = PBKDF2SHA256Plugin(topology_st.standalone)
assert(p2.exists())
# Now restart to make sure we still work from the non-bootstrap form
topology_st.standalone.restart()
p3 = PBKDF2SHA512Plugin(topology_st.standalone)
p3 = PBKDF2SHA256Plugin(topology_st.standalone)
assert(p3.exists())


4 changes: 2 additions & 2 deletions dirsrvtests/tests/suites/pwp_storage/storage_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ def test_check_two_scheme(topo):

@pytest.mark.skipif(ds_is_older('1.4'), reason="Not implemented")
def test_check_pbkdf2_sha512(topo):
"""Check password scheme PBKDF2-SHA512.
"""Check password scheme PBKDF2-SHA512 is restored after deletion
:id: 31612e7e-33a6-11ea-a750-8c16451d917b
:setup: Standalone
Expand All @@ -409,7 +409,7 @@ def test_check_pbkdf2_sha512(topo):
plg._protected = False
plg.delete()
topo.standalone.restart()
assert Config(topo.standalone).get_attr_val_utf8('passwordStorageScheme') == 'PBKDF2-SHA512'
assert Config(topo.standalone).get_attr_val_utf8('passwordStorageScheme') == value
assert topo.standalone.status()
user.delete()

Expand Down

0 comments on commit 802fb91

Please sign in to comment.