Skip to content

L
libvmod-blobcode
Commit a13257a0 authored by Nils Goroll's avatar Nils Goroll
Browse files
Options

fix logexpect syntax error with current master 

In tests, use {...} for regexen

This fixes them for current master and also helps readability
parent 945b2979
Pipeline #121 skipped
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 54 deletions
src/tests/base64.vtc
View file @ a13257a0
......@@ -277,12 +277,9 @@ client c1 {
logexpect l1 -v v1 -d 1 -g vxid -q "VCL_Error" {
expect 0 * Begin req
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"-_-_\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"\+/\+/\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"TWFu\"$"
#"
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "-_-_"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "\+/\+/"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "TWFu"$}
expect * = End
} -start
......
src/tests/base64_n.vtc
View file @ a13257a0
......@@ -191,12 +191,9 @@ client c1 {
logexpect l1 -v v1 -d 1 -g vxid -q "VCL_Error" {
expect 0 * Begin req
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"-_-_\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"\+/\+/\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"TWFu\"$"
#"
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "-_-_"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "\+/\+/"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "TWFu"$}
expect * = End
} -start
......
src/tests/examples.vtc
View file @ a13257a0
......@@ -145,7 +145,7 @@ varnish v1 -arg "-p http_max_hdr=128" -vcl+backend {
} -start
logexpect l1 -v v1 {
expect * 1001 VCL_Log "^Using VMOD blobcode version \S+$"
expect * 1001 VCL_Log {^Using VMOD blobcode version \S+$}
} -start
client c1 {
......
src/tests/xcode.vtc
View file @ a13257a0
......@@ -342,29 +342,18 @@ varnish v1 -vcl {
}
logexpect l1 -v v1 -d 0 -g vxid -q "VCL_Error" {
expect 0 * Begin req
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"0x123456\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"-_-_\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"\+/\+/\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"TWFu\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"_-_-\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"/\+/\+\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"Zm9v\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"%\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"%2\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"%q\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"%2q\"$"
#"
expect 0 * Begin req
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "0x123456"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "-_-_"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "\+/\+/"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "TWFu"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "_-_-"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "/\+/\+"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "Zm9v"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "%"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "%2"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "%q"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "%2q"$}
expect * = End
} -start
......
src/tests/xcode_n.vtc
View file @ a13257a0
......@@ -354,24 +354,15 @@ varnish v1 -vcl {
logexpect l1 -v v1 -d 0 -g vxid -q "VCL_Error" {
expect 0 * Begin req
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"0x123456\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"-_-_\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"\+/\+/\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"TWFu\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"_-_-\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"/\+/\+\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"Zm9v\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"%20\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"%20\"$"
#"
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "0x123456"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "-_-_"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "\+/\+/"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "TWFu"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "_-_-"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "/\+/\+"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "Zm9v"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "%20"$}
expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "%20"$}
expect * = End
} -start
......
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