Attachment 13220 Details for Bug 12792 – Patches for v4-6

[patch] Patches for v4-6

BZ12792-v4-6.patch (text/plain), 2.15 KB, created by Amitay Isaacs on 2017-05-17 01:35:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Amitay Isaacs

Created: 2017-05-17 01:35:06 UTC

Size: 2.15 KB

patch

obsolete

>From dc57a3179fb9bc57b0d48bc2e7f1e895e3cb41a5 Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Tue, 7 Mar 2017 16:52:26 +1100
>Subject: [PATCH 1/2] ctdb-tests: Explicitly search for the specific log entry
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12792
>
>... instead of expecting the last line to be the matching log entry.
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>Reviewed-by: Martin Schwenke <martin@meltin.net>
>(cherry picked from commit 3db572832e9b99ea5b6d531d3b7331b8c0131fd6)
>---
> ctdb/tests/eventd/eventd_051.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/ctdb/tests/eventd/eventd_051.sh b/ctdb/tests/eventd/eventd_051.sh
>index 213965a..46162de 100755
>--- a/ctdb/tests/eventd/eventd_051.sh
>+++ b/ctdb/tests/eventd/eventd_051.sh
>@@ -20,4 +20,4 @@ simple_test run monitor 30
> required_result 0 <<EOF
> ctdb-eventd[PID]: 01.test: Running event monitor
> EOF
>-unit_test tail -n 1 "$eventd_logfile"
>+unit_test grep "01.test:" "$eventd_logfile"
>-- 
>2.9.4
>
>
>From 0fbf778fa66a63af0c3e92d46523462bf62b0a8a Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Thu, 20 Apr 2017 14:34:54 +1000
>Subject: [PATCH 2/2] ctdb-tests: Use tighter pattern for matching expected
> output
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12792
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>Reviewed-by: Martin Schwenke <martin@meltin.net>
>
>Autobuild-User(master): Martin Schwenke <martins@samba.org>
>Autobuild-Date(master): Mon May 15 08:08:10 CEST 2017 on sn-devel-144
>
>(cherry picked from commit 9b5078919796da8dd7893e0a4f716dc1f1991de5)
>---
> ctdb/tests/eventd/scripts/local.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/ctdb/tests/eventd/scripts/local.sh b/ctdb/tests/eventd/scripts/local.sh
>index 61fff8c..343205e 100644
>--- a/ctdb/tests/eventd/scripts/local.sh
>+++ b/ctdb/tests/eventd/scripts/local.sh
>@@ -122,7 +122,7 @@ simple_test ()
> 
> result_filter ()
> {
>-	_duration="[0-9]*\.[0-9][0-9][0-9]"
>+	_duration="\<[0-9][0-9]*\.[0-9][0-9][0-9]\>"
> 	_day="$Mon\|Tue\|Wed\|Thu\|Fri\|Sat\|Sun$"
> 	_month="$Jan\|Feb\|Mar\|Apr\|May\|Jun\|Jul\|Aug\|Sep\|Oct\|Nov\|Dec$"
> 	_date="$ [0-9]\|[0-9][0-9]$"
>-- 
>2.9.4
>

Flags:

martins: review+

Actions: View

Attachments on bug 12792: 13220