diff options
| author | Mathias Stearn <mathias@10gen.com> | 2017-05-19 17:06:56 -0400 |
|---|---|---|
| committer | Mathias Stearn <mathias@10gen.com> | 2017-06-07 13:28:51 -0400 |
| commit | 107327303755a830236bfef5827b543d88223b89 (patch) | |
| tree | 25a9c9586fbcf1ba17651fe00abbd4a6bfebd929 /src/mongo/executor/network_interface_asio_test.cpp | |
| parent | b89c05e65c3168cef9c813f3feca2b1a63621ca2 (diff) | |
| download | mongo-107327303755a830236bfef5827b543d88223b89.tar.gz | |
SERVER-29264 Kill off rpc::RequestInterface
Diffstat (limited to 'src/mongo/executor/network_interface_asio_test.cpp')
| -rw-r--r-- | src/mongo/executor/network_interface_asio_test.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/mongo/executor/network_interface_asio_test.cpp b/src/mongo/executor/network_interface_asio_test.cpp index 1f14d4063f5..0d353728df0 100644 --- a/src/mongo/executor/network_interface_asio_test.cpp +++ b/src/mongo/executor/network_interface_asio_test.cpp @@ -782,7 +782,7 @@ TEST_F(NetworkInterfaceASIOConnectionHookTest, MakeRequestReturnsNone) { // Simulate user command. stream->simulateServer(rpc::Protocol::kOpCommandV1, [&](RemoteCommandRequest request) -> RemoteCommandResponse { - ASSERT_BSONOBJ_EQ(commandRequest, request.cmdObj); + ASSERT_BSONOBJ_EQ(commandRequest, request.cmdObj.removeField("$db")); RemoteCommandResponse response; response.data = commandReply; @@ -814,6 +814,13 @@ TEST_F(NetworkInterfaceASIOConnectionHookTest, HandleReplyReturnsError) { << "blah" << "ok" << 1.0); + BSONObj hookUnifiedRequest = ([&] { + BSONObjBuilder bob; + bob.appendElements(hookCommandRequest); + bob.appendElements(hookRequestMetadata); + bob.append("$db", "foo"); + return bob.obj(); + }()); BSONObj hookReplyMetadata = BSON("1111" << 2222); Status handleReplyError{ErrorCodes::AuthSchemaIncompatible, "daowdjkpowkdjpow"}; @@ -853,8 +860,8 @@ TEST_F(NetworkInterfaceASIOConnectionHookTest, HandleReplyReturnsError) { // Simulate hook reply stream->simulateServer(rpc::Protocol::kOpCommandV1, [&](RemoteCommandRequest request) -> RemoteCommandResponse { - ASSERT_BSONOBJ_EQ(request.cmdObj, hookCommandRequest); - ASSERT_BSONOBJ_EQ(request.metadata, hookRequestMetadata); + ASSERT_BSONOBJ_EQ(request.cmdObj, hookUnifiedRequest); + ASSERT_BSONOBJ_EQ(request.metadata, BSONObj()); RemoteCommandResponse response; response.data = hookCommandReply; @@ -1027,7 +1034,7 @@ TEST_F(NetworkInterfaceASIOMetadataTest, Metadata) { // Simulate hook reply stream->simulateServer(rpc::Protocol::kOpCommandV1, [&](RemoteCommandRequest request) -> RemoteCommandResponse { - ASSERT_EQ("bar", request.metadata["foo"].str()); + ASSERT_EQ("bar", request.cmdObj["foo"].str()); RemoteCommandResponse response; response.data = BSON("ok" << 1); response.metadata = BSON("baz" |