summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jstests/core/cursorb.js18
-rw-r--r--jstests/libs/parallelTester.js7
2 files changed, 6 insertions, 19 deletions
diff --git a/jstests/core/cursorb.js b/jstests/core/cursorb.js
deleted file mode 100644
index 62c6db802dd..00000000000
--- a/jstests/core/cursorb.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// The 'cursor not found in map -1' warning is not logged when get more exhausts a client cursor.
-// SERVER-6931
-
-t = db.jstests_cursorb;
-t.drop();
-
-// Exhaust a client cursor in get more.
-for (i = 0; i < 200; ++i) {
- t.save({a: i});
-}
-t.find().itcount();
-
-// Check that the 'cursor not found in map -1' message is not printed. This message indicates an
-// attempt to look up a cursor with an invalid id and should never appear in the log.
-log = db.adminCommand({getLog: 'global'}).log;
-log.forEach(function(line) {
- assert(!line.match(/cursor not found in map -1 /), 'Cursor map lookup with id -1.');
-});
diff --git a/jstests/libs/parallelTester.js b/jstests/libs/parallelTester.js
index 372e604c4ef..411ac2518cc 100644
--- a/jstests/libs/parallelTester.js
+++ b/jstests/libs/parallelTester.js
@@ -253,7 +253,12 @@ if (typeof _threadInject != "undefined") {
parallelFilesDir + "/profile_parallel_collection_scan.js",
parallelFilesDir + "/profile_repair_cursor.js",
parallelFilesDir + "/profile_sampling.js",
- parallelFilesDir + "/profile_update.js"
+ parallelFilesDir + "/profile_update.js",
+
+ // These tests use getLog to examine the slow query logs. Tests which examine the slow
+ // query logs can't be run concurrently with tests that affect the profile sampling
+ // rate, since that also impacts which operations get logged.
+ parallelFilesDir + "/getlog2.js",
];
var serialTests = makeKeys(serialTestsArr);