diff options
author | Spencer T Brody <spencer@mongodb.com> | 2015-05-29 18:13:48 -0400 |
---|---|---|
committer | Spencer T Brody <spencer@mongodb.com> | 2015-05-29 18:13:48 -0400 |
commit | e181ea38af737ef7aaf5f8228f870d8c7149b2bb (patch) | |
tree | 5c340753a9315e29b0c4b738c262eee7f538df64 /src/mongo/db/curop_test.cpp | |
parent | c6a542c1e69e0027c7a10f865cfa7767d5ed089d (diff) | |
download | mongo-e181ea38af737ef7aaf5f8228f870d8c7149b2bb.tar.gz |
Revert "SERVER-14995 Move operation id, lockState and client fields to OperationContext."
This reverts commit 4ea38c308da292f43e29d32b1b53b7324db0bafe.
Diffstat (limited to 'src/mongo/db/curop_test.cpp')
-rw-r--r-- | src/mongo/db/curop_test.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mongo/db/curop_test.cpp b/src/mongo/db/curop_test.cpp index 1f4f58153eb..17ac612c3a3 100644 --- a/src/mongo/db/curop_test.cpp +++ b/src/mongo/db/curop_test.cpp @@ -33,7 +33,6 @@ #include "mongo/base/init.h" #include "mongo/db/client.h" #include "mongo/db/curop.h" -#include "mongo/db/operation_context_noop.h" #include "mongo/db/service_context.h" #include "mongo/db/service_context_noop.h" #include "mongo/stdx/memory.h" @@ -78,8 +77,7 @@ namespace mongo { TEST(TimeHasExpired, PosSimple) { auto service = stdx::make_unique<ServiceContextNoop>(); auto client = service->makeClient("CurOpTest"); - OperationContextNoop txn(client.get(), 100); - CurOp curOp(&txn); + CurOp curOp(client.get()); curOp.setMaxTimeMicros(intervalShort); curOp.ensureStarted(); sleepmicros(intervalLong); @@ -90,8 +88,7 @@ namespace mongo { TEST(TimeHasExpired, NegSimple) { auto service = stdx::make_unique<ServiceContextNoop>(); auto client = service->makeClient("CurOpTest"); - OperationContextNoop txn(client.get(), 100); - CurOp curOp(&txn); + CurOp curOp(client.get()); curOp.setMaxTimeMicros(intervalLong); curOp.ensureStarted(); sleepmicros(intervalShort); |