summaryrefslogtreecommitdiff
path: root/src/mongo/db/concurrency/d_concurrency_test.cpp
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2014-12-12 10:10:50 -0500
committerKaloian Manassiev <kaloian.manassiev@mongodb.com>2014-12-12 10:10:50 -0500
commitab7a8649faf5c21901c719bbc88840ba7382a5d0 (patch)
tree8a00cc8f917fc7751b565f8fe496ecd3e9e12f8c /src/mongo/db/concurrency/d_concurrency_test.cpp
parent5950976bb7c42acec51850614edcebe6ad8bb233 (diff)
downloadmongo-ab7a8649faf5c21901c719bbc88840ba7382a5d0.tar.gz
SERVER-16429 Get rid of assertWriteLocked which was doing incomplete check
Diffstat (limited to 'src/mongo/db/concurrency/d_concurrency_test.cpp')
-rw-r--r--src/mongo/db/concurrency/d_concurrency_test.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mongo/db/concurrency/d_concurrency_test.cpp b/src/mongo/db/concurrency/d_concurrency_test.cpp
index cdc28b34d25..b874a1c1b4d 100644
--- a/src/mongo/db/concurrency/d_concurrency_test.cpp
+++ b/src/mongo/db/concurrency/d_concurrency_test.cpp
@@ -176,7 +176,7 @@ namespace mongo {
Lock::DBLock r1(&ls, "db1", MODE_X);
Lock::DBLock r2(&ls, "db1", MODE_X);
- ASSERT(ls.isWriteLocked("db1"));
+ ASSERT(ls.isDbLockedForMode("db1", MODE_X));
}
TEST(DConcurrency, MultipleConflictingDBLocksOnSameThread) {
@@ -185,7 +185,8 @@ namespace mongo {
Lock::DBLock r1(&ls, "db1", MODE_X);
Lock::DBLock r2(&ls, "db1", MODE_S);
- ASSERT(ls.isWriteLocked("db1"));
+ ASSERT(ls.isDbLockedForMode("db1", MODE_X));
+ ASSERT(ls.isDbLockedForMode("db1", MODE_S));
}
TEST(DConcurrency, IsDbLockedForSMode) {