[master] b6ab994 Don't test on exact resolver error messages, they vary per platform because the messages in the reference version were horrible.

Poul-Henning Kamp phk at FreeBSD.org
Wed Jan 24 22:46:06 UTC 2018


commit b6ab994d678e8e308b926c3218a83f7ad417efcc
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Jan 24 22:44:45 2018 +0000

    Don't test on exact resolver error messages, they vary per platform
    because the messages in the reference version were horrible.
    
    Also don't rely on protocol numbers, they vary per platform.

diff --git a/bin/varnishtest/tests/o00000.vtc b/bin/varnishtest/tests/o00000.vtc
index 931238e..3bb7cd5 100644
--- a/bin/varnishtest/tests/o00000.vtc
+++ b/bin/varnishtest/tests/o00000.vtc
@@ -34,10 +34,10 @@ logexpect l1 -v v1 {
 	expect * 1002	ProxyGarbage	"PROXY1: Too few fields"
 	expect * 1003	ProxyGarbage	"PROXY1: Too many fields"
 	expect * 1004	ProxyGarbage	"PROXY1: Wrong TCP\\[46\\] field"
-	expect * 1005	ProxyGarbage	"PROXY1: Cannot resolve source address \\(nodename nor servname provided, or not known\\)"
-	expect * 1007	ProxyGarbage	"PROXY1: Cannot resolve destination address \\(nodename nor servname provided, or not known\\)"
-	expect * 1013	ProxyGarbage	"PROXY1: TCP4 got wrong protocol \\(30\\)"
-	expect * 1014	ProxyGarbage	"PROXY1: TCP6 got wrong protocol \\(2\\)"
+	expect * 1005	ProxyGarbage	"PROXY1: Cannot resolve source address \\(.*\\)"
+	expect * 1007	ProxyGarbage	"PROXY1: Cannot resolve destination address \\(.*\\)"
+	expect * 1013	ProxyGarbage	"PROXY1: TCP4 got wrong protocol \\([0-9]*\\)"
+	expect * 1014	ProxyGarbage	"PROXY1: TCP6 got wrong protocol \\([0-9]*\\)"
 	expect * 1015	Proxy		"1 1.2.3.4 1234 5.6.7.8 5678"
 	expect * 1018	Proxy		"1 1:f::2 1234 5:a::8 5678"
 	expect * 1021	Proxy		"1 1:f::3 1234 5:a::8 5678"


More information about the varnish-commit mailing list