Attachment 4626 Details for Bug 26807

[patch] Vorschlag zur weiteren Verbesserung

bug26807_qa.patch (text/plain), 3.67 KB, created by Arvid Requate on 2012-08-29 14:08 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2012-08-29 14:08 CEST

Size: 3.67 KB

patch

obsolete

>Index: ucs-test/tests/50_samba/35smbclient_auth
>===================================================================
>--- ucs-test/tests/50_samba/35smbclient_auth	(Revision 35061)
>+++ ucs-test/tests/50_samba/35smbclient_auth	(Arbeitskopie)
>@@ -1,5 +1,5 @@
> #!/usr/share/ucs-test/runner bash
>-## desc: Check wether many parallel smbclient authentifications are possible
>+## desc: Check whether several parallel smbclient authentifications are possible
> ## exposure: safe
> ## packages:
> ##  - screen
>@@ -23,12 +23,12 @@
> #Parameters for configuration:
> #	smbauth_totalRounds: amount of rounds (default=3)
> #	
>-#	smbauth_amountPerRound: amount of authentifications per round (default=8)
>+#	smbauth_amountPerRound: amount of authentifications per round (default=10)
> #	
> #	smbauth_roundTime: defines the time in which all authentifications in one
>-#		round are triggered (default=5)
>+#		round are triggered (default=1)
> #
>-#	$smbauth_delay: delay between each round (default=10)
>+#	$smbauth_delay: delay between each round (default=1)
> 
> trap cleanup INT TERM EXIT
> 
>@@ -47,7 +47,7 @@
> then 
> 	amountPerRound=$smbauth_amountPerRound
> else
>-	amountPerRound=8
>+	amountPerRound=10
> fi  
> 
> #the total number of authentifications
>@@ -58,7 +58,7 @@
> then  
> 	roundTime=$smbauth_roundTime
> else
>-	roundTime=5
>+	roundTime=1
> fi
> 
> #delay between each round
>@@ -66,12 +66,9 @@
> then
> 	delay=$smbauth_delay
> else
>-	delay=10
>+	delay=1
> fi
> 
>-SHARE_HOST="$ldap_master"
>-SHARE_POSITION="cn=$ldap_master,cn=shares,$ldap_base"
>-
> #create user
> username=`user_randomname`
> password=univention
>@@ -80,7 +77,7 @@
> share_create $share_name /$share_name
> share_dn=`univention-directory-manager shares/share list --filter sambaName="$share_name" | sed -ne 's/^DN: //p'`
> udm shares/share modify --dn=$share_dn --set sambaPublic=1
>-sleep 10
>+sleep 20
> 
> 
> function create_screenconfig
>@@ -105,10 +102,12 @@
> 	let i=0
> 	while [ $i -lt $amountPerRound  ]
> 	do
>-    	screen -S smbclients_$screenIndex -p $authIndex -X stuff "smbclient -U $username%$password //`dig +short ${ldap_master}`/$share_name"`echo -ne '\015'` &
>+    	screen -S smbclients_$screenIndex -p $authIndex -X stuff "smbclient -U "$username%$password" //$ldap_master/$share_name"$'\n' &
>     	echo Nr. $i
> 
>-		sleep ${delayArray[$i]}
>+		if [ $roundIndex != $totalRounds ]; then
>+			sleep ${delayArray[$i]}
>+		fi
> 
>     	let i=$i+1
> 		let authIndex=$authIndex+1
>@@ -137,26 +136,22 @@
>     sum=0
> 	sum2=0
> 
>-#create a random number fÃ¼r every authentification at startup
>+	#create a random number fÃ¼r every authentification at startup
>     for ((j=0;j<amountPerRound;j++))
>     do
>-        delayArray[$j]=$[($RANDOM%9999+1)]
>+        delayArray[$j]=$(($RANDOM%9999+1))
>         delayArray[$j]=`echo "scale=5;${delayArray[j]}/10000" | bc`
>-       # echo "nr $j: ${delayArray[$j]}"
>         sum=`echo "scale=5;$sum+${delayArray[$j]}" | bc`
>     done
>-   # echo  $sum
> 
>-#adapt numbers so that the sum of them equals $startTime, hence authentifications start in this time interval 
>+	#adjust numbers so that the sum of them equals $startTime,
>+	#hence authentifications start in this time interval 
>     for ((j=0;j<amountPerRound;j++))
>     do
>         delayArray[$j]=`echo "scale=5;${delayArray[$j]}/$sum*$roundTime" | bc`
>-        #echo "nr $j: ${delayArray[$j]}"
> 							      
>         sum2=`echo "scale=5;$sum2+${delayArray[$j]}" | bc`
>     done
>- #   echo $sum2
>-
> }
> 
> function cleanup
>@@ -198,7 +193,6 @@
> do
>     create_screenconfig $round_nr
> done
>-sleep 14
> 
> screenIndex=0
> roundIndex=0
>@@ -216,7 +210,7 @@
> 
> if [ "$result" != "$amount" ]
> then
>-fail_test 1 "Only $result of $amount authentifications have been successful"
>+	fail_test 1 "Only $result of $amount authentifications have been successful"
> fi
> 
>

Actions: View | Diff

Attachments on bug 26807: 4626 | 5324