[4.1] 5e88d78 Back-port b00050.vtc to 4.1

[Martin Blix Grydeland]

commit 5e88d78ad28b5fd5d0a115dda2a335abe75d9e63
Author: Dridi Boukelmoune <dridi at varnish-software.com>
Date:   Wed Mar 8 14:27:32 2017 +0100

    Back-port b00050.vtc to 4.1

diff --git a/bin/varnishtest/tests/b00050.vtc b/bin/varnishtest/tests/b00050.vtc
index ef9918b..9c4705c 100644
--- a/bin/varnishtest/tests/b00050.vtc
+++ b/bin/varnishtest/tests/b00050.vtc
@@ -20,42 +20,42 @@ logexpect l1 -wait
 
 # vxid only supports integer operations
 
-shell -err -expect "Expected vxid operator got '~'" {
-	varnishlog -n ${v1_name} -d -q 'vxid ~ 1001'
+err_shell "Expected vxid operator got '~'" {
+	varnishlog -n ${v1_name} -d -q 'vxid ~ 1001' 2>&1
 }
 
-shell -err -expect "Expected vxid operator got '!~'" {
-	varnishlog -n ${v1_name} -d -q 'vxid !~ 1001'
+err_shell "Expected vxid operator got '!~'" {
+	varnishlog -n ${v1_name} -d -q 'vxid !~ 1001' 2>&1
 }
 
-shell -err -expect "Expected vxid operator got 'eq'" {
-	varnishlog -n ${v1_name} -d -q 'vxid eq 1001'
+err_shell "Expected vxid operator got 'eq'" {
+	varnishlog -n ${v1_name} -d -q 'vxid eq 1001' 2>&1
 }
 
-shell -err -expect "Expected vxid operator got 'ne'" {
-	varnishlog -n ${v1_name} -d -q 'vxid ne 1001'
+err_shell "Expected vxid operator got 'ne'" {
+	varnishlog -n ${v1_name} -d -q 'vxid ne 1001' 2>&1
 }
 
 # vxid only supports integer operands
 
-shell -err -expect "Expected integer got '1001.5'" {
-	varnishlog -n ${v1_name} -d -q 'vxid != 1001.5'
+err_shell "Expected integer got '1001.5'" {
+	varnishlog -n ${v1_name} -d -q 'vxid != 1001.5' 2>&1
 }
 
 # vxid doesn't support taglist selection
 
-shell -err -expect "Unexpected taglist selection for vxid" {
-	varnishlog -n ${v1_name} -d -q 'vxid[1] >= 1001'
+err_shell "Unexpected taglist selection for vxid" {
+	varnishlog -n ${v1_name} -d -q 'vxid[1] >= 1001' 2>&1
 }
 
-shell -err -expect "Unexpected taglist selection for vxid" {
-	varnishlog -n ${v1_name} -d -q '{1}vxid <= 1001'
+err_shell "Unexpected taglist selection for vxid" {
+	varnishlog -n ${v1_name} -d -q '{1}vxid <= 1001' 2>&1
 }
 
-shell -err -expect "Unexpected taglist selection for vxid" {
-	varnishlog -n ${v1_name} -d -q 'vxid,Link > 1001'
+err_shell "Unexpected taglist selection for vxid" {
+	varnishlog -n ${v1_name} -d -q 'vxid,Link > 1001' 2>&1
 }
 
-shell -err -expect "Unexpected taglist selection for vxid" {
-	varnishlog -n ${v1_name} -d -q 'vxid,vxid < 1001'
+err_shell "Unexpected taglist selection for vxid" {
+	varnishlog -n ${v1_name} -d -q 'vxid,vxid < 1001' 2>&1
 }