From 40d7b2a87db6ee08a98e76d92c346c9a388b52eb Mon Sep 17 00:00:00 2001 From: Alvaro Saurin Date: Wed, 27 May 2015 14:52:03 +0200 Subject: [PATCH] Dump the zone database status on "weave status" Fix the smoke test by updating the regexps used for parsing "weave status" output --- nameserver/http.go | 1 + test/500_weave_multi_cidr_test.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nameserver/http.go b/nameserver/http.go index bb37d67a..5b9621a8 100644 --- a/nameserver/http.go +++ b/nameserver/http.go @@ -23,6 +23,7 @@ func ListenHTTP(version string, server *DNSServer, domain string, db Zone, port muxRouter.Methods("GET").Path("/status").HandlerFunc(func(w http.ResponseWriter, r *http.Request) { fmt.Fprintln(w, "weave DNS", version) fmt.Fprintln(w, server.Status()) + fmt.Fprintln(w, db.Status()) }) muxRouter.Methods("PUT").Path("/name/{id:.+}/{ip:.+}").HandlerFunc(func(w http.ResponseWriter, r *http.Request) { diff --git a/test/500_weave_multi_cidr_test.sh b/test/500_weave_multi_cidr_test.sh index 4e3edf32..3514cfa3 100755 --- a/test/500_weave_multi_cidr_test.sh +++ b/test/500_weave_multi_cidr_test.sh @@ -21,11 +21,11 @@ assert_zone_records() { FQDN=$1; shift # Assert correct number of records exist - assert "weave_on $HOST status | grep \"^$CID\" | wc -l" $# + assert "weave_on $HOST status | grep \"^$CID\" | grep -oE \"\b([0-9]{1,3}\.){3}[0-9]{1,3}\b\" | wc -l" $# # Assert correct records exist for IP; do - assert_raises "weave_on $HOST status | grep \"^$CID $IP $FQDN$\"" + assert_raises "weave_on $HOST status | grep \"$CID\" | grep \"$IP\" | grep \"$FQDN\"" done }