Attachment 11141 Details for Bug 56645

[patch] fixup-0ba9c99581.patch

fixup-0ba9c99581.patch (text/plain), 1.17 KB, created by Arvid Requate on 2023-11-09 18:24 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2023-11-09 18:24 CET

Size: 1.17 KB

patch

obsolete

>diff --git a/test/ucs-test/tests/51_samba4/52replication_sysvol b/test/ucs-test/tests/51_samba4/52replication_sysvol
>index 9074189fbc..28c1c9632a 100755
>--- a/test/ucs-test/tests/51_samba4/52replication_sysvol
>+++ b/test/ucs-test/tests/51_samba4/52replication_sysvol
>@@ -52,7 +52,7 @@ s4host_fqdn=$(determine_neighbour_s4host) ||
> gponame=$(random_chars 8 "${_upperletters}${_lowerletters}${_ciphers}")	## samba RC6 seems to dislike UTF-8 in GPO names
> 
> ## general sanity check: wait for the samba-share.py Listener to synchronize /etc/samba/shares.conf and /etc/samba/shares.conf.d (Bug #29399)
>-retry 15 samba-tool domain info 127.0.0.1 >/dev/null 2>&1 ||
>+retry_delay=2 retry 15 samba-tool domain info 127.0.0.1 >/dev/null 2>&1 ||
> 	echo "samba-tool Failure (Bug #29399)" >&2
> 
> sysvol_path="/var/lib/samba/sysvol"
>@@ -112,7 +112,9 @@ mode=$(stat -c "%a" "$gpo_path")
> 
> echo "## check whether the GPO is listed in samba-tool"
> check_gpo () { output=$(samba-tool gpo show "$gpo_cn" 2>&1) && grep -Eq "^GPO\s+:\s$gpo_cn" <<<"$output"; }
>-retry 10 check_gpo ||
>+retry 10 check_gpo || {
>+	[ -n "$output" ] && echo "$output"
> 	fail_fast 1 "GPO is not listed in samba-tool"
>+}
> 
> exit "$RETVAL"

Actions: View | Diff

Attachments on bug 56645: 11130 | 11141