From: Joseph Sutton Date: Tue, 10 May 2022 04:18:14 +0000 (+1200) Subject: tests/user_check_password_script: Don't try to delete user after failed add X-Git-Tag: talloc-2.3.4~188 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ede2fcb5fe855ceb81b8f7f40975334f52c811b5;p=thirdparty%2Fsamba.git tests/user_check_password_script: Don't try to delete user after failed add The user account should not exist if account creation failed. Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/tests/samba_tool/user_check_password_script.py b/python/samba/tests/samba_tool/user_check_password_script.py index 12d98eb7b62..60a9add1a19 100644 --- a/python/samba/tests/samba_tool/user_check_password_script.py +++ b/python/samba/tests/samba_tool/user_check_password_script.py @@ -42,10 +42,6 @@ class UserCheckPwdTestCase(SambaToolCmdTest): "-H", "ldap://%s" % os.environ["DC_SERVER"], "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"])) self.assertCmdFail(result, "Should fail adding a user with %s password." % desc) - (result, out, err) = self.runsubcmd("user", "delete", user["name"], - "-H", "ldap://%s" % os.environ["DC_SERVER"], - "-U%s%%%s" % (os.environ["DC_USERNAME"], os.environ["DC_PASSWORD"])) - self.assertCmdSuccess(result, out, err, "Should delete user with %s password." % desc) (result, out, err) = self.runsubcmd("user", "add", user["name"], good_password, "-H", "ldap://%s" % os.environ["DC_SERVER"], diff --git a/selftest/knownfail.d/samba-tool-add-user b/selftest/knownfail.d/samba-tool-add-user deleted file mode 100644 index e487281ed7d..00000000000 --- a/selftest/knownfail.d/samba-tool-add-user +++ /dev/null @@ -1,2 +0,0 @@ -^samba.tests.samba_tool.user_check_password_script.samba.tests.samba_tool.user_check_password_script.UserCheckPwdTestCase.test_checkpassword_unacceptable.chgdcpass:local -^samba.tests.samba_tool.user_check_password_script.samba.tests.samba_tool.user_check_password_script.UserCheckPwdTestCase.test_checkpassword_username.chgdcpass:local