Attachment 11793 Details for Bug 11697 – proposed fix for 4.4.next

[patch] proposed fix for 4.4.next

dfqtest44.patch (text/plain), 1.39 KB, created by Uri Simchoni on 2016-01-28 05:29:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Uri Simchoni

Created: 2016-01-28 05:29:48 UTC

Size: 1.39 KB

patch

obsolete

>From f9b30b49ae3d7bf37881cbb2693e5ec0d8679f0a Mon Sep 17 00:00:00 2001
>From: Uri Simchoni <uri@samba.org>
>Date: Wed, 27 Jan 2016 21:47:30 +0200
>Subject: [PATCH] selftest: fix test_dfree_quota.sh
>
>Eliminate backslashes from smbcquotas output so that we
>don't have to deal with them correctly when parsing the output.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11697
>
>Signed-off-by: Uri Simchoni <uri@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit e7a8ef4f260cc3d07654664c9e547263a2bc8ee6)
>---
> source3/script/tests/test_dfree_quota.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/script/tests/test_dfree_quota.sh b/source3/script/tests/test_dfree_quota.sh
>index c693b7b..5392d3d 100755
>--- a/source3/script/tests/test_dfree_quota.sh
>+++ b/source3/script/tests/test_dfree_quota.sh
>@@ -128,10 +128,10 @@ test_smbcquotas() {
>     shift
> 	subunit_start_test "$name"
>     setup_conf "$conf" "."
>-	output=$($VALGRIND $smbcquotas //$SERVER/dfq $@ 2>/dev/null)
>+	output=$($VALGRIND $smbcquotas //$SERVER/dfq $@ 2>/dev/null | tr '\\' '/')
> 	status=$?
> 	if [ "$status" = "0" ]; then
>-		received=$(echo "$output" | awk "/$SERVER\\\\$user/ {printf \"%s%s%s\", \$3, \$4, \$5}")
>+		received=$(echo "$output" | awk "/$SERVER\\/$user/ {printf \"%s%s%s\", \$3, \$4, \$5}")
> 		if [ "$expected" = "$received" ]; then
> 			subunit_pass_test "$name"
> 		else
>-- 
>2.4.3
>

Flags:

jra: review+

Actions: View

Attachments on bug 11697: 11793