From aaa0c96532ba6a8ea9146e4298c6bf1cc6b27f9e Mon Sep 17 00:00:00 2001 From: Randolph Tan Date: Wed, 27 Sep 2017 23:34:00 -0400 Subject: Revert "Revert "SERVER-30894 Implement command for transferring session information during migration"" This reverts commit 522f7f7d36a4a71059dd2d5219c2a0f074dfd0a1. --- src/mongo/db/ops/write_ops_retryability_test.cpp | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'src/mongo/db/ops/write_ops_retryability_test.cpp') diff --git a/src/mongo/db/ops/write_ops_retryability_test.cpp b/src/mongo/db/ops/write_ops_retryability_test.cpp index f3415ae2427..a50c51eba58 100644 --- a/src/mongo/db/ops/write_ops_retryability_test.cpp +++ b/src/mongo/db/ops/write_ops_retryability_test.cpp @@ -273,23 +273,6 @@ TEST_F(FindAndModifyRetryability, NestedUpsert) { ASSERT_BSONOBJ_EQ(BSON("x" << 1), result.getValue()); } -TEST_F(FindAndModifyRetryability, ErrorIfRequestIsUpsertButOplogIsUpdate) { - auto request = FindAndModifyRequest::makeUpdate(kNs, BSONObj(), BSONObj()); - request.setUpsert(true); - - Timestamp imageTs(120, 3); - repl::OplogEntry noteOplog( - repl::OpTime(imageTs, 1), 0, repl::OpTypeEnum::kNoop, kNs, BSON("x" << 1 << "z" << 1)); - - insertOplogEntry(noteOplog); - - repl::OplogEntry oplog( - repl::OpTime(), 0, repl::OpTypeEnum::kUpdate, kNs, BSON("x" << 1), BSON("y" << 1)); - oplog.setPreImageTs(imageTs); - - ASSERT_THROWS(parseOplogEntryForFindAndModify(opCtx(), request, oplog), AssertionException); -} - TEST_F(FindAndModifyRetryability, AttemptingToRetryUpsertWithUpdateWithoutUpsertErrors) { auto request = FindAndModifyRequest::makeUpdate(kNs, BSONObj(), BSONObj()); request.setUpsert(false); -- cgit v1.2.1