diff options
-rw-r--r-- | etc/evergreen.yml | 6 | ||||
-rw-r--r-- | jstests/concurrency/fsm_all.js | 2 | ||||
-rw-r--r-- | jstests/concurrency/fsm_all_simultaneous.js | 2 | ||||
-rw-r--r-- | jstests/disk/killall.js | 1 | ||||
-rw-r--r-- | jstests/noPassthroughWithMongod/btreedel.js | 1 | ||||
-rw-r--r-- | jstests/noPassthroughWithMongod/mr_writeconflict.js | 2 | ||||
-rw-r--r-- | jstests/noPassthroughWithMongod/ttl_repl_maintenance.js | 1 | ||||
-rw-r--r-- | jstests/parallel/basic.js | 2 | ||||
-rw-r--r-- | jstests/parallel/basicPlus.js | 2 | ||||
-rw-r--r-- | jstests/parallel/del.js | 1 | ||||
-rw-r--r-- | jstests/serial_run/index_multi.js | 1 | ||||
-rw-r--r-- | src/mongo/dbtests/query_plan_executor.cpp | 12 |
12 files changed, 12 insertions, 21 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 936b4bb3f8c..9a891c2092c 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -8301,7 +8301,7 @@ buildvariants: gorootvars: GOROOT=/opt/go PATH="/opt/go/bin:$PATH" tooltags: "-tags 'ssl sasl'" rlp_environment: MONGOD_UNITTEST_RLP_LANGUAGE_TEST_BTROOT=/opt/basis - test_flags: --storageEngine=mobile --excludeWithAnyTags=requires_mmapv1,requires_wiredtiger,requires_sharding,requires_replication,SERVER-32709,SERVER-32675 + test_flags: --storageEngine=mobile --excludeWithAnyTags=requires_mmapv1,requires_wiredtiger,requires_sharding,requires_replication,SERVER-32709,SERVER-32869,SERVER-32993,SERVER-32997 compile_flags: --ssl MONGO_DISTMOD=rhel62 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_gcc.vars CPPPATH="/opt/basis/rlp/rlp/include /opt/basis/rlp/utilities/include" --use-basis-tech-rosette-linguistics-platform=on num_jobs_available: $(grep -c ^processor /proc/cpuinfo) use_scons_cache: true @@ -8336,6 +8336,7 @@ buildvariants: - name: jsCore_op_query - name: jsonSchema - name: aggregation_fuzzer + - name: jstestfuzz - name: noPassthrough - name: noPassthroughWithMongod - name: parallel @@ -8360,7 +8361,7 @@ buildvariants: push_arch: x86_64-enterprise gorootvars: CGO_CPPFLAGS=-I/opt/mongodbtoolchain/v2/include CGO_CFLAGS=-mmacosx-version-min=10.10 CGO_LDFLAGS=-mmacosx-version-min=10.10 tooltags: "-tags 'ssl sasl'" - test_flags: --storageEngine=mobile --excludeWithAnyTags=requires_mmapv1,requires_wiredtiger,requires_sharding,requires_replication,SERVER-32709,SERVER-32710,SERVER-32675 + test_flags: --storageEngine=mobile --excludeWithAnyTags=requires_mmapv1,requires_wiredtiger,requires_sharding,requires_replication,SERVER-32709,SERVER-32869,SERVER-32993,SERVER-32997 compile_env: DEVELOPER_DIR=/Applications/Xcode8.3.app compile_flags: --ssl -j$(sysctl -n hw.logicalcpu) --release --libc++ CCFLAGS="-mmacosx-version-min=10.10" LINKFLAGS="-mmacosx-version-min=10.10" CPPPATH=/opt/mongodbtoolchain/v2/include num_jobs_available: 1 @@ -8389,6 +8390,7 @@ buildvariants: - name: jsCore_op_query - name: jsonSchema - name: aggregation_fuzzer + - name: jstestfuzz - name: noPassthrough - name: noPassthroughWithMongod - name: parallel diff --git a/jstests/concurrency/fsm_all.js b/jstests/concurrency/fsm_all.js index 80f8905e87e..d8de96833da 100644 --- a/jstests/concurrency/fsm_all.js +++ b/jstests/concurrency/fsm_all.js @@ -1,4 +1,4 @@ -// @tags: [SERVER-32675] +// @tags: [SERVER-32993] 'use strict'; load('jstests/concurrency/fsm_libs/runner.js'); diff --git a/jstests/concurrency/fsm_all_simultaneous.js b/jstests/concurrency/fsm_all_simultaneous.js index 513f9b93113..07cb9b8a8e7 100644 --- a/jstests/concurrency/fsm_all_simultaneous.js +++ b/jstests/concurrency/fsm_all_simultaneous.js @@ -1,4 +1,4 @@ -// @tags: [SERVER-32675] +// @tags: [SERVER-32997] 'use strict'; load('jstests/concurrency/fsm_libs/runner.js'); diff --git a/jstests/disk/killall.js b/jstests/disk/killall.js index 675c2a42c5f..b37a66a1216 100644 --- a/jstests/disk/killall.js +++ b/jstests/disk/killall.js @@ -4,6 +4,7 @@ * * For our purposes, "prompt" is defined as "before stopMongod() decides to send a SIGKILL", which * would not result in a zero return code. + * @tags: [SERVER-32997] */ var baseName = "jstests_disk_killall"; diff --git a/jstests/noPassthroughWithMongod/btreedel.js b/jstests/noPassthroughWithMongod/btreedel.js index 13c3bb3b685..76a0f909cc0 100644 --- a/jstests/noPassthroughWithMongod/btreedel.js +++ b/jstests/noPassthroughWithMongod/btreedel.js @@ -1,4 +1,5 @@ // btreedel.js
+// @tags: [SERVER-32869]
t = db.foo;
t.remove({});
diff --git a/jstests/noPassthroughWithMongod/mr_writeconflict.js b/jstests/noPassthroughWithMongod/mr_writeconflict.js index cdf42a57c47..fad351192ee 100644 --- a/jstests/noPassthroughWithMongod/mr_writeconflict.js +++ b/jstests/noPassthroughWithMongod/mr_writeconflict.js @@ -1,5 +1,5 @@ // SERVER-16262: Write-conflict during map-reduce operations -// @tags: [SERVER-32675] +// @tags: [SERVER-32997] (function() { "use strict"; diff --git a/jstests/noPassthroughWithMongod/ttl_repl_maintenance.js b/jstests/noPassthroughWithMongod/ttl_repl_maintenance.js index 44250c4f1d2..53e704ab8fe 100644 --- a/jstests/noPassthroughWithMongod/ttl_repl_maintenance.js +++ b/jstests/noPassthroughWithMongod/ttl_repl_maintenance.js @@ -3,6 +3,7 @@ * dummy replset config & TTL collection, then restarts the member and ensures that it doesn't * time out the docs in the TTL collection. Then it removes the "config" and * restarts, ensuring that the TTL monitor deletes the docs. + * @tags: [SERVER-32997] */ var runner; diff --git a/jstests/parallel/basic.js b/jstests/parallel/basic.js index ac06a68a89d..e0fdb1fc088 100644 --- a/jstests/parallel/basic.js +++ b/jstests/parallel/basic.js @@ -1,5 +1,5 @@ // perform basic js tests in parallel -// @tags: [SERVER-32675] +// @tags: [SERVER-32993] load('jstests/libs/parallelTester.js'); Random.setRandomSeed(); diff --git a/jstests/parallel/basicPlus.js b/jstests/parallel/basicPlus.js index 23d91c3054e..e3c4c6bd151 100644 --- a/jstests/parallel/basicPlus.js +++ b/jstests/parallel/basicPlus.js @@ -1,5 +1,5 @@ // perform basic js tests in parallel & some other tasks as well -// @tags: [SERVER-32675] +// @tags: [SERVER-32993] load('jstests/libs/parallelTester.js'); var c = db.jstests_parallel_basicPlus; diff --git a/jstests/parallel/del.js b/jstests/parallel/del.js index 93471d599a6..3128f89d05e 100644 --- a/jstests/parallel/del.js +++ b/jstests/parallel/del.js @@ -1,4 +1,3 @@ -// @tags: [SERVER-32675] load('jstests/libs/parallelTester.js'); N = 1000; diff --git a/jstests/serial_run/index_multi.js b/jstests/serial_run/index_multi.js index 32808e99dcb..a09b20fee96 100644 --- a/jstests/serial_run/index_multi.js +++ b/jstests/serial_run/index_multi.js @@ -1,5 +1,4 @@ // Attempt to build 63 indexes simultaneously -// @tags: [SERVER-32675] Random.setRandomSeed(); diff --git a/src/mongo/dbtests/query_plan_executor.cpp b/src/mongo/dbtests/query_plan_executor.cpp index 6e8d248725f..8f8025e4b9d 100644 --- a/src/mongo/dbtests/query_plan_executor.cpp +++ b/src/mongo/dbtests/query_plan_executor.cpp @@ -193,12 +193,6 @@ private: * PlanExecutor is doing a collection scan. */ TEST_F(PlanExecutorTest, DropCollScan) { - // SERVER-32675: Skip this test for Mobile SE. - // This test should run successfully after fixing the server ticket. - if (mongo::storageGlobalParams.engine == "mobile") { - return; - } - OldClientWriteContext ctx(&_opCtx, nss.ns()); insert(BSON("_id" << 1)); insert(BSON("_id" << 2)); @@ -221,12 +215,6 @@ TEST_F(PlanExecutorTest, DropCollScan) { * Test dropping the collection while the PlanExecutor is doing an index scan. */ TEST_F(PlanExecutorTest, DropIndexScan) { - // SERVER-32675: Skip this test for Mobile SE. - // This test should run successfully after fixing the server ticket. - if (mongo::storageGlobalParams.engine == "mobile") { - return; - } - OldClientWriteContext ctx(&_opCtx, nss.ns()); insert(BSON("_id" << 1 << "a" << 6)); insert(BSON("_id" << 2 << "a" << 7)); |