[master] 8f7ac0f Align varnishtest naming with vcl
Guillaume Quintard
guillaume at varnish-software.com
Thu Sep 8 13:05:12 CEST 2016
commit 8f7ac0fc4ca080db8ee38f5e0bdd1e1cff9032a2
Author: Guillaume Quintard <guillaume at varnish-software.com>
Date: Thu Sep 8 13:01:19 2016 +0200
Align varnishtest naming with vcl
change resp.msg to resp.reason
Spotted by: Nils Goroll
diff --git a/bin/varnishtest/tests/a00001.vtc b/bin/varnishtest/tests/a00001.vtc
index d842287..fd2ea9c 100644
--- a/bin/varnishtest/tests/a00001.vtc
+++ b/bin/varnishtest/tests/a00001.vtc
@@ -15,7 +15,7 @@ client c1 -connect ${s1_sock} {
rxresp
expect resp.proto == HTTP/1.1
expect resp.status == 200
- expect resp.msg == OK
+ expect resp.reason == OK
}
client c1 -run
diff --git a/bin/varnishtest/tests/a00002.vtc b/bin/varnishtest/tests/a00002.vtc
index 39b8334..79c5517 100644
--- a/bin/varnishtest/tests/a00002.vtc
+++ b/bin/varnishtest/tests/a00002.vtc
@@ -15,7 +15,7 @@ client c1 -connect ${s1_sock} {
rxresp
expect resp.proto == HTTP/1.2
expect resp.status == 201
- expect resp.msg == Foo
+ expect resp.reason == Foo
}
client c1 -run
diff --git a/bin/varnishtest/tests/a00003.vtc b/bin/varnishtest/tests/a00003.vtc
index 810da48..b924c76 100644
--- a/bin/varnishtest/tests/a00003.vtc
+++ b/bin/varnishtest/tests/a00003.vtc
@@ -24,7 +24,7 @@ client c1 -connect ${s1_sock} {
rxresp
expect resp.proto == HTTP/1.2
expect resp.status == 201
- expect resp.msg == Foo
+ expect resp.reason == Foo
}
client c2 -connect ${s2_sock} {
@@ -32,7 +32,7 @@ client c2 -connect ${s2_sock} {
rxresp
expect resp.proto == HTTP/1.1
expect resp.status == 200
- expect resp.msg == OK
+ expect resp.reason == OK
}
client c1 -start
diff --git a/bin/varnishtest/tests/a00004.vtc b/bin/varnishtest/tests/a00004.vtc
index 85659ac..ce3a3b5 100644
--- a/bin/varnishtest/tests/a00004.vtc
+++ b/bin/varnishtest/tests/a00004.vtc
@@ -15,7 +15,7 @@ client c1 -connect ${s1_sock} {
rxresp
expect resp.proto == HTTP/1.2
expect resp.status == 201
- expect resp.msg == Foo
+ expect resp.reason == Foo
}
client c2 -connect ${s1_sock} {
@@ -23,7 +23,7 @@ client c2 -connect ${s1_sock} {
rxresp
expect resp.proto == HTTP/1.2
expect resp.status == 201
- expect resp.msg == Foo
+ expect resp.reason == Foo
}
client c1 -start
diff --git a/bin/varnishtest/tests/a00005.vtc b/bin/varnishtest/tests/a00005.vtc
index 6c0d634..3d8aa49 100644
--- a/bin/varnishtest/tests/a00005.vtc
+++ b/bin/varnishtest/tests/a00005.vtc
@@ -24,7 +24,7 @@ client c1 -connect ${s1_sock} {
rxresp
expect resp.proto == HTTP/1.2
expect resp.status == 201
- expect resp.msg == Foo
+ expect resp.reason == Foo
}
client c1 -run
@@ -34,7 +34,7 @@ client c1 -connect ${s2_sock} {
rxresp
expect resp.proto == HTTP/1.1
expect resp.status == 200
- expect resp.msg == OK
+ expect resp.reason == OK
}
client c1 -run
diff --git a/bin/varnishtest/tests/a00006.vtc b/bin/varnishtest/tests/a00006.vtc
index f8a928e..160c883 100644
--- a/bin/varnishtest/tests/a00006.vtc
+++ b/bin/varnishtest/tests/a00006.vtc
@@ -17,7 +17,7 @@ client c1 -connect ${s1_sock} {
rxresp
expect resp.proto == HTTP/1.2
expect resp.status == 201
- expect resp.msg == Foo
+ expect resp.reason == Foo
}
client c1 -run
diff --git a/bin/varnishtest/tests/b00030.vtc b/bin/varnishtest/tests/b00030.vtc
index 1115613..a3fb9cc 100644
--- a/bin/varnishtest/tests/b00030.vtc
+++ b/bin/varnishtest/tests/b00030.vtc
@@ -20,5 +20,5 @@ varnish v1 -vcl+backend {
client c1 {
txreq
rxresp
- expect resp.msg == "-1.000"
+ expect resp.reason == "-1.000"
} -run
diff --git a/bin/varnishtest/tests/b00036.vtc b/bin/varnishtest/tests/b00036.vtc
index 4cd6e17..c07fe86 100644
--- a/bin/varnishtest/tests/b00036.vtc
+++ b/bin/varnishtest/tests/b00036.vtc
@@ -26,7 +26,7 @@ client c1 {
txreq -req PURGE
rxresp
- expect resp.msg == "Purged"
+ expect resp.reason == "Purged"
} -run
client c1 {
diff --git a/bin/varnishtest/tests/c00066.vtc b/bin/varnishtest/tests/c00066.vtc
index 14d4126..7d8f972 100644
--- a/bin/varnishtest/tests/c00066.vtc
+++ b/bin/varnishtest/tests/c00066.vtc
@@ -43,13 +43,13 @@ client c1 {
txreq -url "/"
rxresp
expect resp.status == 200
- expect resp.msg == "OK"
+ expect resp.reason == "OK"
delay .1
txreq -url "/synth"
rxresp
expect resp.status == 200
- expect resp.msg == "Synth test"
+ expect resp.reason == "Synth test"
delay .1
txreq -url "/error"
diff --git a/bin/varnishtest/tests/r00325.vtc b/bin/varnishtest/tests/r00325.vtc
index b9c7a56..e361479 100644
--- a/bin/varnishtest/tests/r00325.vtc
+++ b/bin/varnishtest/tests/r00325.vtc
@@ -15,7 +15,7 @@ client c1 {
txreq -url /bar
rxresp
expect resp.status == 200
- expect resp.msg == OK
+ expect resp.reason == OK
} -run
server s1 {
@@ -31,5 +31,5 @@ client c1 {
txreq -url /foo
rxresp
expect resp.status == 200
- expect resp.msg == OK
+ expect resp.reason == OK
} -run
diff --git a/bin/varnishtest/tests/r00962.vtc b/bin/varnishtest/tests/r00962.vtc
index cc5168c..c66dc84 100644
--- a/bin/varnishtest/tests/r00962.vtc
+++ b/bin/varnishtest/tests/r00962.vtc
@@ -51,7 +51,7 @@ varnish v2 \
client c1 -connect ${v2_sock} {
txreq -url "/"
rxresp
- expect resp.msg != "Persistent Object Not Found"
+ expect resp.reason != "Persistent Object Not Found"
expect resp.status == 200
expect resp.http.X-Varnish == "1001 1002"
} -run
diff --git a/bin/varnishtest/tests/r01485.vtc b/bin/varnishtest/tests/r01485.vtc
index 14aba70..302f177 100644
--- a/bin/varnishtest/tests/r01485.vtc
+++ b/bin/varnishtest/tests/r01485.vtc
@@ -22,7 +22,7 @@ client c1 {
rxresp
expect resp.status == 200
expect resp.bodylen == 1
- expect resp.msg == "OK"
+ expect resp.reason == "OK"
delay 0.1
@@ -30,5 +30,5 @@ client c1 {
rxresp
expect resp.status == 200
expect resp.bodylen == 1
- expect resp.msg == "OK"
+ expect resp.reason == "OK"
} -run
diff --git a/bin/varnishtest/tests/r01990.vtc b/bin/varnishtest/tests/r01990.vtc
index a430d63..e9f5a19 100644
--- a/bin/varnishtest/tests/r01990.vtc
+++ b/bin/varnishtest/tests/r01990.vtc
@@ -38,7 +38,7 @@ client c1 {
txreq -url "/"
rxresp
expect resp.status == 503
- expect resp.msg == "Unknown HTTP Status"
+ expect resp.reason == "Unknown HTTP Status"
} -run
logexpect l1 -wait
diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index 15e48f5..b2a021f 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -283,7 +283,7 @@ http_count_header(char * const *hh, const char *hdr)
* - req.proto
* - resp.proto
* - resp.status
- * - resp.msg
+ * - resp.reason
* - resp.chunklen
* - req.bodylen
* - req.body
@@ -311,7 +311,7 @@ cmd_var_resolve(struct http *hp, char *spec)
return(hp->resp[0]);
if (!strcmp(spec, "resp.status"))
return(hp->resp[1]);
- if (!strcmp(spec, "resp.msg"))
+ if (!strcmp(spec, "resp.reason"))
return(hp->resp[2]);
if (!strcmp(spec, "resp.chunklen"))
return(hp->chunklen);
More information about the varnish-commit
mailing list