Skip to content

L
libvmod-blobdigest
Commit 98e244d4 authored by Nils Goroll's avatar Nils Goroll
Browse files
Options

remove shard director .key method regression tests 

The purpose of these tests was to ensure that vmod_blobcode works identical
to shard.key(). Now that the latter has been changed to only support SHA256,
we need to remove out tests for custom hashes.
parent 710b25d7
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 68 deletions
src/tests/icrc32.vtc
View file @ 98e244d4
...@@ -50,8 +50,6 @@ varnish v1 -vcl { ...@@ -50,8 +50,6 @@ varnish v1 -vcl {
return(deliver); return(deliver);
} }
set resp.http.a = blob.encode(HEX, UPPER, d2.final()); set resp.http.a = blob.encode(HEX, UPPER, d2.final());
set resp.http.as = blob.encode(HEX, UPPER,
blobdigest.uint32blob(shard.key("a", CRC32)));
if (!d3.update(blob.decode(encoded="b"))) { if (!d3.update(blob.decode(encoded="b"))) {
set resp.status = 500; set resp.status = 500;
...@@ -62,8 +60,6 @@ varnish v1 -vcl { ...@@ -62,8 +60,6 @@ varnish v1 -vcl {
return(deliver); return(deliver);
} }
set resp.http.abc = blob.encode(HEX, UPPER, d3.final()); set resp.http.abc = blob.encode(HEX, UPPER, d3.final());
set resp.http.abcs = blob.encode(HEX, UPPER,
blobdigest.uint32blob(shard.key("abc", CRC32)));
if (!d4.update(blob.decode(encoded=" "))) { if (!d4.update(blob.decode(encoded=" "))) {
set resp.status = 500; set resp.status = 500;
...@@ -74,17 +70,12 @@ varnish v1 -vcl { ...@@ -74,17 +70,12 @@ varnish v1 -vcl {
return(deliver); return(deliver);
} }
set resp.http.msgdigest = blob.encode(HEX, UPPER, d4.final()); set resp.http.msgdigest = blob.encode(HEX, UPPER, d4.final());
set resp.http.msgdigests = blob.encode(HEX, UPPER,
blobdigest.uint32blob(shard.key("message digest", CRC32)));
if (!d5.update(blob.decode(encoded=""))) { if (!d5.update(blob.decode(encoded=""))) {
set resp.status = 500; set resp.status = 500;
return(deliver); return(deliver);
} }
set resp.http.alphalc = blob.encode(HEX, UPPER, d5.final()); set resp.http.alphalc = blob.encode(HEX, UPPER, d5.final());
set resp.http.alphalcs = blob.encode(HEX, UPPER,
blobdigest.uint32blob(
shard.key(blob.encode(IDENTITY, blob=alphalc.get()), CRC32)));
if (!d7.update(alphalc.get())) { if (!d7.update(alphalc.get())) {
set resp.status = 500; set resp.status = 500;
...@@ -95,11 +86,6 @@ varnish v1 -vcl { ...@@ -95,11 +86,6 @@ varnish v1 -vcl {
return(deliver); return(deliver);
} }
set resp.http.alphanum = blob.encode(HEX, UPPER, d7.final()); set resp.http.alphanum = blob.encode(HEX, UPPER, d7.final());
set resp.http.alphanums = blob.encode(HEX, UPPER,
blobdigest.uint32blob(shard.key(
blob.encode(IDENTITY, blob=alphauc.get()) +
blob.encode(IDENTITY, blob=alphalc.get()) +
"0123456789", CRC32)));
if (!d8.update(digits.get())) { if (!d8.update(digits.get())) {
set resp.status = 500; set resp.status = 500;
...@@ -130,21 +116,8 @@ varnish v1 -vcl { ...@@ -130,21 +116,8 @@ varnish v1 -vcl {
return(deliver); return(deliver);
} }
set resp.http.digits = blob.encode(HEX, UPPER, d8.final()); set resp.http.digits = blob.encode(HEX, UPPER, d8.final());
set resp.http.digitss = blob.encode(HEX, UPPER,
blobdigest.uint32blob(shard.key(
blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()), CRC32)));
set resp.http.pangram = blob.encode(HEX, UPPER, d9.final()); set resp.http.pangram = blob.encode(HEX, UPPER, d9.final());
set resp.http.pangrams = blob.encode(HEX, UPPER,
blobdigest.uint32blob(shard.key(
blob.encode(IDENTITY, blob=pangram.get()), CRC32)));
# Tests for the hash() function # Tests for the hash() function
set resp.http.emptyf set resp.http.emptyf
...@@ -194,24 +167,17 @@ client c1 { ...@@ -194,24 +167,17 @@ client c1 {
expect resp.http.empty == "00000000" expect resp.http.empty == "00000000"
expect resp.http.emptyf == resp.http.empty expect resp.http.emptyf == resp.http.empty
expect resp.http.a == "3AB551CE" expect resp.http.a == "3AB551CE"
expect resp.http.as == resp.http.a
expect resp.http.af == resp.http.a expect resp.http.af == resp.http.a
expect resp.http.abc == "CA6598D0" expect resp.http.abc == "CA6598D0"
expect resp.http.abcs == resp.http.abc
expect resp.http.abcf == resp.http.abc expect resp.http.abcf == resp.http.abc
expect resp.http.msgdigest == "F1AEE4B8" expect resp.http.msgdigest == "F1AEE4B8"
expect resp.http.msgdigests == resp.http.msgdigest
expect resp.http.msgdigestf == resp.http.msgdigest expect resp.http.msgdigestf == resp.http.msgdigest
expect resp.http.alphalc == "E3CBEE8F" expect resp.http.alphalc == "E3CBEE8F"
expect resp.http.alphalcs == resp.http.alphalc
expect resp.http.alphalcf == resp.http.alphalc expect resp.http.alphalcf == resp.http.alphalc
expect resp.http.alphanum == "02A641B3" expect resp.http.alphanum == "02A641B3"
expect resp.http.alphanums == resp.http.alphanum
expect resp.http.alphanumf == resp.http.alphanum expect resp.http.alphanumf == resp.http.alphanum
expect resp.http.digits == "F28A5294" expect resp.http.digits == "F28A5294"
expect resp.http.digitss == resp.http.digits
expect resp.http.digitsf == resp.http.digits expect resp.http.digitsf == resp.http.digits
expect resp.http.pangram == "B9C60808" expect resp.http.pangram == "B9C60808"
expect resp.http.pangrams == resp.http.pangram
expect resp.http.pangramf == resp.http.pangram expect resp.http.pangramf == resp.http.pangram
} -run } -run
src/tests/rs.vtc
View file @ 98e244d4
...@@ -61,8 +61,6 @@ varnish v1 -vcl { ...@@ -61,8 +61,6 @@ varnish v1 -vcl {
return(deliver); return(deliver);
} }
set resp.http.a = blob.encode(HEX, UPPER, d2.final()); set resp.http.a = blob.encode(HEX, UPPER, d2.final());
set resp.http.as = blob.encode(HEX, UPPER,
blobdigest.uint32blob(shard.key("a", RS)));
if (!d3.update(blob.decode(encoded="b"))) { if (!d3.update(blob.decode(encoded="b"))) {
set resp.status = 500; set resp.status = 500;
...@@ -73,8 +71,6 @@ varnish v1 -vcl { ...@@ -73,8 +71,6 @@ varnish v1 -vcl {
return(deliver); return(deliver);
} }
set resp.http.abc = blob.encode(HEX, UPPER, d3.final()); set resp.http.abc = blob.encode(HEX, UPPER, d3.final());
set resp.http.abcs = blob.encode(HEX, UPPER,
blobdigest.uint32blob(shard.key("abc", RS)));
if (!d4.update(blob.decode(encoded=" "))) { if (!d4.update(blob.decode(encoded=" "))) {
set resp.status = 500; set resp.status = 500;
...@@ -85,17 +81,12 @@ varnish v1 -vcl { ...@@ -85,17 +81,12 @@ varnish v1 -vcl {
return(deliver); return(deliver);
} }
set resp.http.msgdigest = blob.encode(HEX, UPPER, d4.final()); set resp.http.msgdigest = blob.encode(HEX, UPPER, d4.final());
set resp.http.msgdigests = blob.encode(HEX, UPPER,
blobdigest.uint32blob(shard.key("message digest", RS)));
if (!d5.update(blob.decode(encoded=""))) { if (!d5.update(blob.decode(encoded=""))) {
set resp.status = 500; set resp.status = 500;
return(deliver); return(deliver);
} }
set resp.http.alphalc = blob.encode(HEX, UPPER, d5.final()); set resp.http.alphalc = blob.encode(HEX, UPPER, d5.final());
set resp.http.alphalcs = blob.encode(HEX, UPPER,
blobdigest.uint32blob(
shard.key(blob.encode(IDENTITY, blob=alphalc.get()), RS)));
if (!d7.update(alphalc.get())) { if (!d7.update(alphalc.get())) {
set resp.status = 500; set resp.status = 500;
...@@ -106,11 +97,6 @@ varnish v1 -vcl { ...@@ -106,11 +97,6 @@ varnish v1 -vcl {
return(deliver); return(deliver);
} }
set resp.http.alphanum = blob.encode(HEX, UPPER, d7.final()); set resp.http.alphanum = blob.encode(HEX, UPPER, d7.final());
set resp.http.alphanums = blob.encode(HEX, UPPER,
blobdigest.uint32blob(shard.key(
blob.encode(IDENTITY, blob=alphauc.get()) +
blob.encode(IDENTITY, blob=alphalc.get()) +
"0123456789", RS)));
if (!d8.update(digits.get())) { if (!d8.update(digits.get())) {
set resp.status = 500; set resp.status = 500;
...@@ -141,21 +127,8 @@ varnish v1 -vcl { ...@@ -141,21 +127,8 @@ varnish v1 -vcl {
return(deliver); return(deliver);
} }
set resp.http.digits = blob.encode(HEX, UPPER, d8.final()); set resp.http.digits = blob.encode(HEX, UPPER, d8.final());
set resp.http.digitss = blob.encode(HEX, UPPER,
blobdigest.uint32blob(shard.key(
blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()), RS)));
set resp.http.pangram = blob.encode(HEX, UPPER, d9.final()); set resp.http.pangram = blob.encode(HEX, UPPER, d9.final());
set resp.http.pangrams = blob.encode(HEX, UPPER,
blobdigest.uint32blob(shard.key(
blob.encode(IDENTITY, blob=pangram.get()), RS)));
if (!d11.update(b64to127.get())) { if (!d11.update(b64to127.get())) {
set resp.status = 500; set resp.status = 500;
...@@ -225,25 +198,18 @@ client c1 { ...@@ -225,25 +198,18 @@ client c1 {
expect resp.http.empty == "00000000" expect resp.http.empty == "00000000"
expect resp.http.emptyf == resp.http.empty expect resp.http.emptyf == resp.http.empty
expect resp.http.a == "00000061" expect resp.http.a == "00000061"
expect resp.http.as == resp.http.a
expect resp.http.af == resp.http.a expect resp.http.af == resp.http.a
expect resp.http.abc == "B1012AAC" expect resp.http.abc == "B1012AAC"
expect resp.http.abcs == resp.http.abc
expect resp.http.abcf == resp.http.abc expect resp.http.abcf == resp.http.abc
expect resp.http.msgdigest == "B4ACD743" expect resp.http.msgdigest == "B4ACD743"
expect resp.http.msgdigests == resp.http.msgdigest
expect resp.http.msgdigestf == resp.http.msgdigest expect resp.http.msgdigestf == resp.http.msgdigest
expect resp.http.alphalc == "C19D0661" expect resp.http.alphalc == "C19D0661"
expect resp.http.alphalcs == resp.http.alphalc
expect resp.http.alphalcf == resp.http.alphalc expect resp.http.alphalcf == resp.http.alphalc
expect resp.http.alphanum == "4389DF19" expect resp.http.alphanum == "4389DF19"
expect resp.http.alphanums == resp.http.alphanum
expect resp.http.alphanumf == resp.http.alphanum expect resp.http.alphanumf == resp.http.alphanum
expect resp.http.digits == "9DA5ECA0" expect resp.http.digits == "9DA5ECA0"
expect resp.http.digitss == resp.http.digits
expect resp.http.digitsf == resp.http.digits expect resp.http.digitsf == resp.http.digits
expect resp.http.pangram == "29A4500B" expect resp.http.pangram == "29A4500B"
expect resp.http.pangrams == resp.http.pangram
expect resp.http.pangramf == resp.http.pangram expect resp.http.pangramf == resp.http.pangram
expect resp.http.allbytes == "D65ECA00" expect resp.http.allbytes == "D65ECA00"
......
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