Attachment 5925 Details for Bug 34968

[patch] Fail some test early

3xxxx_ucs-test-fail.diff (text/plain), 3.88 KB, created by Philipp Hahn on 2014-05-26 13:22 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2014-05-26 13:22 CEST

Size: 3.88 KB

patch

obsolete

>diff --git a/branches/ucs-3.2/ucs-3.2-2/test/ucs-test/tests/00_base/95rename_administrator b/branches/ucs-3.2/ucs-3.2-2/test/ucs-test/tests/00_base/95rename_administrator
>index a4a2dc9..e307bd8 100755
>--- a/branches/ucs-3.2/ucs-3.2-2/test/ucs-test/tests/00_base/95rename_administrator
>+++ b/branches/ucs-3.2/ucs-3.2-2/test/ucs-test/tests/00_base/95rename_administrator
>@@ -24,7 +24,8 @@ udm-test users/user create --position "cn=users,$ldap_base" \
> 		--set password=univention \
> 		--set primaryGroup="cn=Domain Admins,cn=groups,$ldap_base"
> 
>-udm-test users/user modify --dn "uid=Administrator,cn=users,$ldap_base" --set username="$USERNAME"
>+udm-test users/user modify --dn "uid=Administrator,cn=users,$ldap_base" --set username="$USERNAME" ||
>+	fail_fast 1 "Failed to rename user 'Administrator'"
> 
> # wait a little bit longer since we have to wait for the slapd restart
> trap "udm users/user modify --dn \"uid=$USERNAME,cn=users,$ldap_base\" --set username=\"Administrator\" \
>@@ -48,7 +49,7 @@ cat /etc/univention/templates/info/*.info | sed -ne 's|^File: ||p;s|^Multifile:
> 	[ "$template" = etc/nagios3/nagios.cfg ] && continue #ignore comment
> 	[ "$template" = etc/issue ] && continue #ignore comment
> 	[ "$template" = etc/bind/named.conf.samba4 ] && continue # Bug #33892
>-	
>+
> 	echo -n "Checking $template: "
> 	if [[ "$template" == etc/security/access-* ]]; then
> 		grep "Administrator," "/$template" && exit 1
>@@ -75,4 +76,3 @@ for file in /etc/ldap/slapd.conf \
> done
> 
> exit "$RETVAL"
>-
>diff --git a/branches/ucs-3.2/ucs-3.2-2/test/ucs-test/tests/00_base/96rename_domain_admins b/branches/ucs-3.2/ucs-3.2-2/test/ucs-test/tests/00_base/96rename_domain_admins
>index 52f4189..79fe575 100755
>--- a/branches/ucs-3.2/ucs-3.2-2/test/ucs-test/tests/00_base/96rename_domain_admins
>+++ b/branches/ucs-3.2/ucs-3.2-2/test/ucs-test/tests/00_base/96rename_domain_admins
>@@ -17,14 +17,15 @@
> eval "$(ucr shell)"
> 
> s4_services="$(univention-ldapsearch univentionService="Samba 4" | sed -ne 's|dn: ||p')"
>-if [ -n "$s4_services" ]; then	
>+if [ -n "$s4_services" ]; then
> 	echo "Skip in S4 environments. See https://forge.univention.org/bugzilla/show_bug.cgi?id=34802."
> 	exit 137
> fi
> 
> GROUPNAME=$(group_randomnameme)
> 
>-udm-test groups/group modify --dn "cn=Domain Admins,cn=groups,$ldap_base" --set name="$GROUPNAME"
>+udm-test groups/group modify --dn "cn=Domain Admins,cn=groups,$ldap_base" --set name="$GROUPNAME" ||
>+	fail_fast 1 "Failed to rename group 'Domain Admins'"
> 
> # wait a little bit longer since we have to wait for the slapd restart
> trap "udm-test groups/group modify --dn \"cn=$GROUPNAME,cn=groups,$ldap_base\" --set name=\"Domain Admins\"; \
>@@ -86,4 +87,3 @@ if [ "$server_role" != "memberserver" ]; then
> fi
> 
> exit "$RETVAL"
>-
>diff --git a/branches/ucs-3.2/ucs-3.2-2/test/ucs-test/tests/00_base/96rename_domain_users b/branches/ucs-3.2/ucs-3.2-2/test/ucs-test/tests/00_base/96rename_domain_users
>index 2cdbd21..8174a0b 100755
>--- a/branches/ucs-3.2/ucs-3.2-2/test/ucs-test/tests/00_base/96rename_domain_users
>+++ b/branches/ucs-3.2/ucs-3.2-2/test/ucs-test/tests/00_base/96rename_domain_users
>@@ -15,14 +15,15 @@
> . "$TESTLIBPATH/group.sh" || exit 137
> 
> s4_services="$(univention-ldapsearch univentionService="Samba 4" | sed -ne 's|dn: ||p')"
>-if [ -n "$s4_services" ]; then	
>+if [ -n "$s4_services" ]; then
> 	echo "Skip in S4 environments. See https://forge.univention.org/bugzilla/show_bug.cgi?id=34802."
> 	exit 137
> fi
> 
> GROUPNAME=$(group_randomnameme)
> 
>-udm-test groups/group modify --dn "cn=Domain Users,cn=groups,$ldap_base" --set name="$GROUPNAME"
>+udm-test groups/group modify --dn "cn=Domain Users,cn=groups,$ldap_base" --set name="$GROUPNAME" ||
>+	fail_fast 1 "Failed to rename group 'Domain Users'"
> 
> trap "udm-test groups/group modify --dn \"cn=$GROUPNAME,cn=groups,$ldap_base\" --set name=\"Domain Users\"; wait_for_replication_and_postrun" EXIT
> 
>@@ -57,4 +58,3 @@ for file in /etc/security/limits.conf; do
> done
> 
> exit "$RETVAL"
>-

Actions: View | Diff

Attachments on bug 34968: 5925