Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

forgot a conflict

This commit is contained in:
Simon Grätzer 2019-10-31 14:48:46 +01:00
parent b0a2e207c1
commit 43b7882d4b
No known key found for this signature in database
GPG Key ID: E4736AA091116E5C
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/Network/MethodsTest.cpp
View File

@ -199,13 +199,10 @@ TEST_F(NetworkMethodsTest, request_with_retry_after_not_found_error) {
std::shared_ptr<VPackBuilder> b = VPackParser::fromJson("{\"errorNum\":1203}");
auto resBuffer = b->steal();
pool->_conn->_response->setPayload(std::move(*resBuffer), 0);
<<<<<<< HEAD
=======
network::RequestOptions reqOpts;
reqOpts.timeout = network::Timeout(60.0);
reqOpts.retryNotFound = true;
>>>>>>> a2d6f7833066d918b2e395d9825d5a0edb093730
VPackBuffer<uint8_t> buffer;
auto f = network::sendRequestRetry(pool.get(), "tcp://example.org:80",