From 9101b1839abe305545f487b10939b498e1c09280 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Thu, 14 Jun 2012 12:50:56 +0000
Subject: stratum-overlap-warns: make test more loose

the exact format of the logging may change, so just check that the
artifact, the chunks and the files are mentioned
---
 tests/stratum-overlap-warns.script | 12 +++++++++++-
 tests/stratum-overlap-warns.stdout |  5 -----
 2 files changed, 11 insertions(+), 6 deletions(-)
 delete mode 100644 tests/stratum-overlap-warns.stdout

(limited to 'tests')

diff --git a/tests/stratum-overlap-warns.script b/tests/stratum-overlap-warns.script
index edb1d855..2e9965fe 100755
--- a/tests/stratum-overlap-warns.script
+++ b/tests/stratum-overlap-warns.script
@@ -21,8 +21,18 @@
 set -eu
 
 log="$DATADIR/morph.log"
+warnings="$DATADIR/warnings"
 cache="$DATADIR/cache/artifacts"
 
+warning_mentions(){
+    grep -F "$1" <"$warnings" >/dev/null 2>/dev/null
+}
+
 "$SRCDIR/scripts/test-morph" \
     build --log=$log test:morphs-repo overlap overlap-stratum.morph
-grep WARNING $log | sed 's/^.*WARNING/WARNING/'
+grep WARNING "$log" >"$warnings"
+for str in overlap-stratum \
+           overlap-foo-baz overlap-foobar bin/bar \
+           overlap-fooqux bin/foo; do
+    warning_mentions 'overlap-stratum' || exit $?
+done
diff --git a/tests/stratum-overlap-warns.stdout b/tests/stratum-overlap-warns.stdout
deleted file mode 100644
index eaddf9c1..00000000
--- a/tests/stratum-overlap-warns.stdout
+++ /dev/null
@@ -1,5 +0,0 @@
-WARNING Overlaps in artifact overlap-stratum detected
-WARNING   Artifacts overlap-foo-baz, overlap-foobar overlap with files:
-WARNING     bin/bar
-WARNING   Artifacts overlap-foo-baz, overlap-foobar, overlap-fooqux overlap with files:
-WARNING     bin/foo
-- 
cgit v1.2.1