diff options
| author | Dan Engelbrecht <[email protected]> | 2022-09-29 09:25:29 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-09-29 00:25:29 -0700 |
| commit | f87631dd0d283ad04eb3873c1a7510a9d1423792 (patch) | |
| tree | fb6da8ce9b1e55beff73c82d8943dc0303c7ae05 /zenserver-test | |
| parent | De/more upstream details (#168) (diff) | |
| download | zen-f87631dd0d283ad04eb3873c1a7510a9d1423792.tar.xz zen-f87631dd0d283ad04eb3873c1a7510a9d1423792.zip | |
Format all rpc package responses using `FormatPackageMessageBuffer` to avoid memory copy (#174)
When reading upstream, fall back to old rpc response to handle older instances.
Diffstat (limited to 'zenserver-test')
| -rw-r--r-- | zenserver-test/zenserver-test.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp index 0c519dc7e..61c1e2df1 100644 --- a/zenserver-test/zenserver-test.cpp +++ b/zenserver-test/zenserver-test.cpp @@ -1389,8 +1389,8 @@ TEST_CASE("zcache.rpc") if (Result.status_code == 200) { - CbPackage Response; - if (Response.TryLoad(zen::IoBuffer(zen::IoBuffer::Wrap, Result.text.data(), Result.text.size()))) + CbPackage Response = ParsePackageMessage(zen::IoBuffer(zen::IoBuffer::Wrap, Result.text.data(), Result.text.size())); + if (!Response.IsNull()) { OutResult.Response = std::move(Response); CHECK(OutResult.Result.Parse(OutResult.Response)); @@ -1651,8 +1651,8 @@ TEST_CASE("zcache.failing.upstream") if (Result.status_code == 200) { - CbPackage Response; - if (Response.TryLoad(zen::IoBuffer(zen::IoBuffer::Wrap, Result.text.data(), Result.text.size()))) + CbPackage Response = ParsePackageMessage(zen::IoBuffer(zen::IoBuffer::Wrap, Result.text.data(), Result.text.size())); + if (!Response.IsNull()) { OutResult.Response = std::move(Response); CHECK(OutResult.Result.Parse(OutResult.Response)); @@ -2087,8 +2087,8 @@ TEST_CASE("zcache.rpc.allpolicies") cpr::Header{{"Content-Type", "application/x-ue-cbpkg"}, {"Accept", "application/x-ue-cbpkg"}}, cpr::Body{(const char*)Body.GetData(), Body.GetSize()}); CHECK_MESSAGE(Result.status_code == 200, "GetCacheRecords unexpectedly failed."); - CbPackage Response; - bool Loaded = Response.TryLoad(zen::IoBuffer(zen::IoBuffer::Wrap, Result.text.data(), Result.text.size())); + CbPackage Response = ParsePackageMessage(zen::IoBuffer(zen::IoBuffer::Wrap, Result.text.data(), Result.text.size())); + bool Loaded = !Response.IsNull(); CHECK_MESSAGE(Loaded, "GetCacheRecords response failed to load."); cacherequests::GetCacheRecordsResult RequestResult; CHECK(RequestResult.Parse(Response)); @@ -2166,8 +2166,9 @@ TEST_CASE("zcache.rpc.allpolicies") cpr::Header{{"Content-Type", "application/x-ue-cbpkg"}, {"Accept", "application/x-ue-cbpkg"}}, cpr::Body{(const char*)Body.GetData(), Body.GetSize()}); CHECK_MESSAGE(Result.status_code == 200, "GetCacheValues unexpectedly failed."); - CbPackage Response; - bool Loaded = Response.TryLoad(zen::IoBuffer(zen::IoBuffer::Wrap, Result.text.data(), Result.text.size())); + IoBuffer MessageBuffer(zen::IoBuffer::Wrap, Result.text.data(), Result.text.size()); + CbPackage Response = ParsePackageMessage(MessageBuffer); + bool Loaded = !Response.IsNull(); CHECK_MESSAGE(Loaded, "GetCacheValues response failed to load."); cacherequests::GetCacheValuesResult GetCacheValuesResult; CHECK(GetCacheValuesResult.Parse(Response)); @@ -2234,8 +2235,8 @@ TEST_CASE("zcache.rpc.allpolicies") cpr::Header{{"Content-Type", "application/x-ue-cbpkg"}, {"Accept", "application/x-ue-cbpkg"}}, cpr::Body{(const char*)Body.GetData(), Body.GetSize()}); CHECK_MESSAGE(Result.status_code == 200, "GetCacheChunks unexpectedly failed."); - CbPackage Response; - bool Loaded = Response.TryLoad(zen::IoBuffer(zen::IoBuffer::Wrap, Result.text.data(), Result.text.size())); + CbPackage Response = ParsePackageMessage(zen::IoBuffer(zen::IoBuffer::Wrap, Result.text.data(), Result.text.size())); + bool Loaded = !Response.IsNull(); CHECK_MESSAGE(Loaded, "GetCacheChunks response failed to load."); cacherequests::GetCacheChunksResult GetCacheChunksResult; CHECK(GetCacheChunksResult.Parse(Response)); |