View | Details | Raw Unified | Return to bug 56645
Collapse All | Expand All

(-)a/test/ucs-test/tests/51_samba4/52replication_sysvol (-2 / +4 lines)
 Lines 52-58   s4host_fqdn=$(determine_neighbour_s4host) || Link Here 
52
gponame=$(random_chars 8 "${_upperletters}${_lowerletters}${_ciphers}")	## samba RC6 seems to dislike UTF-8 in GPO names
52
gponame=$(random_chars 8 "${_upperletters}${_lowerletters}${_ciphers}")	## samba RC6 seems to dislike UTF-8 in GPO names
53
53
54
## general sanity check: wait for the samba-share.py Listener to synchronize /etc/samba/shares.conf and /etc/samba/shares.conf.d (Bug #29399)
54
## general sanity check: wait for the samba-share.py Listener to synchronize /etc/samba/shares.conf and /etc/samba/shares.conf.d (Bug #29399)
55
retry 15 samba-tool domain info 127.0.0.1 >/dev/null 2>&1 ||
55
retry_delay=2 retry 15 samba-tool domain info 127.0.0.1 >/dev/null 2>&1 ||
56
	echo "samba-tool Failure (Bug #29399)" >&2
56
	echo "samba-tool Failure (Bug #29399)" >&2
57
57
58
sysvol_path="/var/lib/samba/sysvol"
58
sysvol_path="/var/lib/samba/sysvol"
 Lines 112-118   mode=$(stat -c "%a" "$gpo_path") Link Here 
112
112
113
echo "## check whether the GPO is listed in samba-tool"
113
echo "## check whether the GPO is listed in samba-tool"
114
check_gpo () { output=$(samba-tool gpo show "$gpo_cn" 2>&1) && grep -Eq "^GPO\s+:\s$gpo_cn" <<<"$output"; }
114
check_gpo () { output=$(samba-tool gpo show "$gpo_cn" 2>&1) && grep -Eq "^GPO\s+:\s$gpo_cn" <<<"$output"; }
115
retry 10 check_gpo ||
115
retry 10 check_gpo || {
116
	[ -n "$output" ] && echo "$output"
116
	fail_fast 1 "GPO is not listed in samba-tool"
117
	fail_fast 1 "GPO is not listed in samba-tool"
118
}
117
119
118
exit "$RETVAL"
120
exit "$RETVAL"

Return to bug 56645