[SCM] Samba Shared Repository - branch master updated

[Martin Schwenke]

The branch, master has been updated
       via  9b50789 ctdb-tests: Use tighter pattern for matching expected output
       via  3db5728 ctdb-tests: Explicitly search for the specific log entry
      from  5098636 s4: nmblookup: Allocate event context off NULL instead of talloc_autofree_context().

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9b5078919796da8dd7893e0a4f716dc1f1991de5
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Thu Apr 20 14:34:54 2017 +1000

    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 at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Mon May 15 08:08:10 CEST 2017 on sn-devel-144

commit 3db572832e9b99ea5b6d531d3b7331b8c0131fd6
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue Mar 7 16:52:26 2017 +1100

    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 at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>

-----------------------------------------------------------------------

Summary of changes:
 ctdb/tests/eventd/eventd_051.sh    | 2 +-
 ctdb/tests/eventd/scripts/local.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

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"
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]\)"


-- 
Samba Shared Repository