From 5479d0a54d35adb42dd029d23dda19a4f26e0d5e Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 18 Jun 2015 18:53:06 +0100 Subject: [PATCH] improve test performance - only fetch status once per check --- test/500_weave_multi_cidr_test.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/500_weave_multi_cidr_test.sh b/test/500_weave_multi_cidr_test.sh index 8de1cce6..6f3a34a1 100755 --- a/test/500_weave_multi_cidr_test.sh +++ b/test/500_weave_multi_cidr_test.sh @@ -26,12 +26,13 @@ assert_zone_records() { FQDN=$3 shift 3 + records=$(weave_on $HOST status | grep "^$CID") || true # Assert correct number of records exist - assert "weave_on $HOST status | grep '^$CID' | grep -oE '\b([0-9]{1,3}\.){3}[0-9]{1,3}\b' | wc -l" $# + assert "echo $records | grep -oE '\b([0-9]{1,3}\.){3}[0-9]{1,3}\b' | wc -l" $# # Assert correct records exist for ADDR; do - assert_raises "weave_on $HOST status | grep '$CID' | grep '${ADDR%/*}' | grep '$FQDN'" + assert_raises "echo $records | grep '${ADDR%/*}' | grep '$FQDN'" done }