diff options
| author | Stefan Boberg <[email protected]> | 2021-10-19 14:32:18 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-10-19 14:32:18 +0200 |
| commit | 3d7ecc8a64d7a469c87372341343d5ececcdd43f (patch) | |
| tree | bc80151f3e70a4db6ce4c3186a55fd113de465e6 | |
| parent | Merge branch 'main' into gc (diff) | |
| parent | zenserver-test: Fixed up zcache tests (diff) | |
| download | zen-3d7ecc8a64d7a469c87372341343d5ececcdd43f.tar.xz zen-3d7ecc8a64d7a469c87372341343d5ececcdd43f.zip | |
Merge branch 'main' into gc
| -rw-r--r-- | zenserver-test/zenserver-test.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp index 9c9b73042..fec6ca17c 100644 --- a/zenserver-test/zenserver-test.cpp +++ b/zenserver-test/zenserver-test.cpp @@ -1036,10 +1036,11 @@ TEST_CASE("project.basic") zen::CbObject Op = OpWriter.Save(); - zen::BinaryWriter MemOut; zen::CbPackage OpPackage(Op); OpPackage.AddAttachment(Attach); - OpPackage.Save(MemOut); + + zen::BinaryWriter MemOut; + legacy::SaveCbPackage(OpPackage, MemOut); { zen::StringBuilder<64> PostUri; @@ -1829,7 +1830,7 @@ TEST_CASE("zcache.policy") { cpr::Response Result = cpr::Get(cpr::Url{"{}/{}/{}?skip=data"_format(Cfg.BaseUri, Bucket, Key)}, cpr::Header{{"Accept", "application/x-ue-cbpkg"}}); - CHECK(Result.status_code == 200); + CHECK(IsHttpSuccessCode(Result.status_code)); CHECK(Result.text.size() == 0); } @@ -1837,7 +1838,7 @@ TEST_CASE("zcache.policy") { cpr::Response Result = cpr::Get(cpr::Url{"{}/{}/{}?skip=data"_format(Cfg.BaseUri, Bucket, Key)}, cpr::Header{{"Accept", "application/x-ue-cbobject"}}); - CHECK(Result.status_code == 200); + CHECK(IsHttpSuccessCode(Result.status_code)); CHECK(Result.text.size() == 0); } @@ -1845,7 +1846,7 @@ TEST_CASE("zcache.policy") { cpr::Response Result = cpr::Get(cpr::Url{"{}/{}/{}/{}?skip=data"_format(Cfg.BaseUri, Bucket, Key, PayloadId)}, cpr::Header{{"Accept", "application/x-ue-comp"}}); - CHECK(Result.status_code == 200); + CHECK(IsHttpSuccessCode(Result.status_code)); CHECK(Result.text.size() == 0); } } @@ -1873,7 +1874,7 @@ TEST_CASE("zcache.policy") { cpr::Response Result = cpr::Get(cpr::Url{"{}/{}/{}?skip=data"_format(Cfg.BaseUri, Bucket, Key)}, cpr::Header{{"Accept", "application/octet-stream"}}); - CHECK(Result.status_code == 200); + CHECK(IsHttpSuccessCode(Result.status_code)); CHECK(Result.text.size() == 0); } } |