Commit 1190595a authored by Geoff Simmons's avatar Geoff Simmons

add some more tests

parent 460b4f22
...@@ -1980,7 +1980,8 @@ static const char ...@@ -1980,7 +1980,8 @@ static const char
"%{Varnish:hitmiss}x %{Varnish:handling}x %{VCL_Log:baz}x "\ "%{Varnish:hitmiss}x %{Varnish:handling}x %{VCL_Log:baz}x "\
"%{tag:VCL_acl}x %{tag:Debug}x %{tag:Timestamp:Req}x "\ "%{tag:VCL_acl}x %{tag:Debug}x %{tag:Timestamp:Req}x "\
"%{tag:ReqAcct[0]}x %{tag:Timestamp:Resp[2]}x %{vxid}x %{pvxid}x "\ "%{tag:ReqAcct[0]}x %{tag:Timestamp:Resp[2]}x %{vxid}x %{pvxid}x "\
"%{Varnish:side}x" "%{Varnish:side}x %{VSL:VCL_acl}x %{VSL:Debug}x %{VSL:Timestamp:Req}x "\
"%{VSL:ReqAcct[0]}x %{VSL:Timestamp:Resp[2]}x"
VSB_clear(config.cformat); VSB_clear(config.cformat);
VSB_cat(config.cformat, FULL_CLIENT_FMT); VSB_cat(config.cformat, FULL_CLIENT_FMT);
VSB_finish(config.cformat); VSB_finish(config.cformat);
...@@ -2053,7 +2054,9 @@ static const char ...@@ -2053,7 +2054,9 @@ static const char
"http://foobar.com/foo?bar=baz&quux=wilco HTTP/1.1 200 "\ "http://foobar.com/foo?bar=baz&quux=wilco HTTP/1.1 200 "\
"[%d/%b/%Y:%T %z] 0 %F-%T.529143 /foo varnish 0.000166 hit hit "\ "[%d/%b/%Y:%T %z] 0 %F-%T.529143 /foo varnish 0.000166 hit hit "\
"logload MATCH ACL \"10.0.0.0\"/8 \"foo\\0\\377 bar\" " \ "logload MATCH ACL \"10.0.0.0\"/8 \"foo\\0\\377 bar\" " \
"1429213569.602005 0.000000 0.000000 60 0.000125 4711 1147 c\n" "1429213569.602005 0.000000 0.000000 60 0.000125 4711 1147 c "\
"MATCH ACL \"10.0.0.0\"/8 \"foo\\0\\377 bar\" "\
"1429213569.602005 0.000000 0.000000 60 0.000125\n"
tm = localtime(&t); tm = localtime(&t);
MAN(strftime(strftime_s, BUFSIZ, EXP_FULL_CLIENT_OUTPUT, tm)); MAN(strftime(strftime_s, BUFSIZ, EXP_FULL_CLIENT_OUTPUT, tm));
VMASSERT(strcmp(os, strftime_s) == 0, "'%s' != '%s'", os, strftime_s); VMASSERT(strcmp(os, strftime_s) == 0, "'%s' != '%s'", os, strftime_s);
...@@ -2066,7 +2069,9 @@ static const char ...@@ -2066,7 +2069,9 @@ static const char
"%t %T %{%F-%T.%i}t %U %u %{Varnish:time_firstbyte}x %{VCL_Log:baz}x "\ "%t %T %{%F-%T.%i}t %U %u %{Varnish:time_firstbyte}x %{VCL_Log:baz}x "\
"%{tag:Fetch_Body}x %{tag:Debug}x %{tag:Timestamp:Bereq}x "\ "%{tag:Fetch_Body}x %{tag:Debug}x %{tag:Timestamp:Bereq}x "\
"%{tag:BereqAcct[5]}x %{tag:Timestamp:Bereq[1]}x %{vxid}x %{pvxid}x "\ "%{tag:BereqAcct[5]}x %{tag:Timestamp:Bereq[1]}x %{vxid}x %{pvxid}x "\
"%{Varnish:side}x" "%{Varnish:side}x %{VSL:Fetch_Body}x %{VSL:Debug}x "\
"%{VSL:Timestamp:Bereq}x %{VSL:BereqAcct[5]}x "\
"%{VSL:Timestamp:Bereq[1]}x"
VSB_clear(config.bformat); VSB_clear(config.bformat);
VSB_cat(config.bformat, FULL_BACKEND_FMT); VSB_cat(config.bformat, FULL_BACKEND_FMT);
VSB_finish(config.bformat); VSB_finish(config.bformat);
...@@ -2131,7 +2136,9 @@ static const char ...@@ -2131,7 +2136,9 @@ static const char
"http://foobar.com/foo?bar=baz&quux=wilco HTTP/1.1 200 "\ "http://foobar.com/foo?bar=baz&quux=wilco HTTP/1.1 200 "\
"[%d/%b/%Y:%T %z] 0 %F-%T.529143 /foo varnish 0.002837 logload "\ "[%d/%b/%Y:%T %z] 0 %F-%T.529143 /foo varnish 0.002837 logload "\
"2 chunked stream \"foo\\0\\377 bar\" "\ "2 chunked stream \"foo\\0\\377 bar\" "\
"1429210777.728290 0.000048 0.000048 283 0.000048 4711 1147 b\n" "1429210777.728290 0.000048 0.000048 283 0.000048 4711 1147 b "\
"2 chunked stream \"foo\\0\\377 bar\" "\
"1429210777.728290 0.000048 0.000048 283 0.000048\n"
tm = localtime(&t); tm = localtime(&t);
MAN(strftime(strftime_s, BUFSIZ, EXP_FULL_BACKEND_OUTPUT, tm)); MAN(strftime(strftime_s, BUFSIZ, EXP_FULL_BACKEND_OUTPUT, tm));
VMASSERT(strcmp(os, strftime_s) == 0, "'%s' != '%s'", os, strftime_s); VMASSERT(strcmp(os, strftime_s) == 0, "'%s' != '%s'", os, strftime_s);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment