[master] bfaa16e Simplify

[Federico G. Schwindt]

commit bfaa16e862af4fc3231447ec5bdba553458f3171
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Sun Feb 26 18:53:24 2017 +0000

    Simplify
    
    NB: this was not lost during polishing, it was simply redundant.

diff --git a/bin/varnishtest/tests/t02005.vtc b/bin/varnishtest/tests/t02005.vtc
index e13c0e7..55647ff 100644
--- a/bin/varnishtest/tests/t02005.vtc
+++ b/bin/varnishtest/tests/t02005.vtc
@@ -17,8 +17,7 @@ client c1 {
 		expect resp.http.content-Type == "text/plain"
 
 		# Then, payload checks
-		write_body resp.txt
-		shell {grep -q response resp.txt}
+		expect resp.body == response
 	} -run
 } -run
 
diff --git a/bin/varnishtest/tests/v00020.vtc b/bin/varnishtest/tests/v00020.vtc
index faf25f0..5f734fc 100644
--- a/bin/varnishtest/tests/v00020.vtc
+++ b/bin/varnishtest/tests/v00020.vtc
@@ -83,7 +83,6 @@ varnish v1 -vcl {
 		set req.http.foo = 1 - 1;
 		set req.http.foo = 1 + -1;
 		set req.http.foo = 1 - -1;
-		set req.http.foo = 1- -1; # regression test for #2184
 		set req.http.foo = 3 * 2;
 		set req.http.foo = 3 / 2;
 		set req.http.foo = 3 * -2;