From d2b9f18a0d16e1f03a19229bed6e8ffa02744e63 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Tue, 5 Dec 2017 10:35:59 +1300 Subject: [PATCH] tests: make password valid in openldap provision test Test was using an invalid password, which causes test failure with early password validation patch Signed-off-by: Jamie McClymont Reviewed-by: Gary Lockyer --- selftest/knownfail.d/validate-password-early | 1 - source4/setup/tests/blackbox_provision-backend.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 selftest/knownfail.d/validate-password-early diff --git a/selftest/knownfail.d/validate-password-early b/selftest/knownfail.d/validate-password-early deleted file mode 100644 index 76f48aca260..00000000000 --- a/selftest/knownfail.d/validate-password-early +++ /dev/null @@ -1 +0,0 @@ -^samba4.blackbox.provision-backend.openldap-mmr-backend \ No newline at end of file diff --git a/source4/setup/tests/blackbox_provision-backend.sh b/source4/setup/tests/blackbox_provision-backend.sh index fc455d5e12b..3b2f0310298 100755 --- a/source4/setup/tests/blackbox_provision-backend.sh +++ b/source4/setup/tests/blackbox_provision-backend.sh @@ -13,7 +13,7 @@ shift 1 . `dirname $0`/../../../testprogs/blackbox/subunit.sh testit "openldap-backend" $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend --slapd-path=/dev/null --use-ntvfs --ldap-dryrun-mode -testit "openldap-mmr-backend" $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-mmr-backend --ol-mmr-urls="ldap://s4dc1.test:9000,ldap://s4dc2.test:9000" --adminpass=linux --ldapadminpass=linux --slapd-path=/dev/null --use-ntvfs --ldap-dryrun-mode +testit "openldap-mmr-backend" $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-mmr-backend --ol-mmr-urls="ldap://s4dc1.test:9000,ldap://s4dc2.test:9000" --adminpass=Linux123 --ldapadminpass=linux --slapd-path=/dev/null --use-ntvfs --ldap-dryrun-mode testit "fedora-ds-backend" $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend --slapd-path=/dev/null --use-ntvfs --ldap-dryrun-mode reprovision() {