From 6818230171cb12727892802c608ba9247815ef06 Mon Sep 17 00:00:00 2001 From: James Wahlin Date: Wed, 19 Sep 2018 14:42:43 -0400 Subject: Revert "SERVER-36444 disable validation in allPaths tests" This reverts commit 118cc1eeb978f9c5c8492368fe6b5a04669fe3c3. --- jstests/noPassthroughWithMongod/all_paths_and_text_indexes.js | 3 --- jstests/noPassthroughWithMongod/all_paths_basic_index_bounds.js | 3 --- jstests/noPassthroughWithMongod/all_paths_cached_plans.js | 3 --- jstests/noPassthroughWithMongod/all_paths_collation.js | 5 +---- jstests/noPassthroughWithMongod/all_paths_covered_queries.js | 5 +---- jstests/noPassthroughWithMongod/all_paths_index_multikey.js | 3 --- jstests/noPassthroughWithMongod/all_paths_partial_index.js | 3 --- jstests/noPassthroughWithMongod/all_paths_validindex.js | 3 --- 8 files changed, 2 insertions(+), 26 deletions(-) diff --git a/jstests/noPassthroughWithMongod/all_paths_and_text_indexes.js b/jstests/noPassthroughWithMongod/all_paths_and_text_indexes.js index 5f31ed28870..21f6a149aa9 100644 --- a/jstests/noPassthroughWithMongod/all_paths_and_text_indexes.js +++ b/jstests/noPassthroughWithMongod/all_paths_and_text_indexes.js @@ -95,8 +95,5 @@ // Disable $** indexes once the tests have either completed or failed. assert.commandWorked( db.adminCommand({setParameter: 1, internalQueryAllowAllPathsIndexes: false})); - - // TODO: SERVER-36444 remove this coll.drop because validation should work now. - coll.drop(); } })(); diff --git a/jstests/noPassthroughWithMongod/all_paths_basic_index_bounds.js b/jstests/noPassthroughWithMongod/all_paths_basic_index_bounds.js index 132aebd75cc..8252fa5f6bf 100644 --- a/jstests/noPassthroughWithMongod/all_paths_basic_index_bounds.js +++ b/jstests/noPassthroughWithMongod/all_paths_basic_index_bounds.js @@ -213,8 +213,5 @@ // Disable $** indexes once the tests have either completed or failed. assert.commandWorked( db.adminCommand({setParameter: 1, internalQueryAllowAllPathsIndexes: false})); - - // TODO: SERVER-36444 remove calls to drop() once wildcard index validation works. - coll.drop(); } })(); diff --git a/jstests/noPassthroughWithMongod/all_paths_cached_plans.js b/jstests/noPassthroughWithMongod/all_paths_cached_plans.js index 8ac69da4ddb..bd54cba889f 100644 --- a/jstests/noPassthroughWithMongod/all_paths_cached_plans.js +++ b/jstests/noPassthroughWithMongod/all_paths_cached_plans.js @@ -133,7 +133,4 @@ assert.neq(queryIndexedExplain.queryPlanner.queryHash, queryUnindexedExplain.queryPlanner.queryHash); })(); - - // TODO: SERVER-36444 remove calls to drop() once wildcard index validation works. - coll.drop(); })(); diff --git a/jstests/noPassthroughWithMongod/all_paths_collation.js b/jstests/noPassthroughWithMongod/all_paths_collation.js index b8e2afcddf5..d0fc07d3d97 100644 --- a/jstests/noPassthroughWithMongod/all_paths_collation.js +++ b/jstests/noPassthroughWithMongod/all_paths_collation.js @@ -124,8 +124,5 @@ } finally { // Disable $** indexes once the tests have either completed or failed. db.adminCommand({setParameter: 1, internalQueryAllowAllPathsIndexes: false}); - - // TODO: SERVER-36444 remove calls to drop() once wildcard index validation works. - coll.drop(); } -})(); +})(); \ No newline at end of file diff --git a/jstests/noPassthroughWithMongod/all_paths_covered_queries.js b/jstests/noPassthroughWithMongod/all_paths_covered_queries.js index 8f179eda556..1855ab33fdb 100644 --- a/jstests/noPassthroughWithMongod/all_paths_covered_queries.js +++ b/jstests/noPassthroughWithMongod/all_paths_covered_queries.js @@ -90,8 +90,5 @@ } finally { // Disable $** indexes once the tests have either completed or failed. db.adminCommand({setParameter: 1, internalQueryAllowAllPathsIndexes: false}); - - // TODO: SERVER-36444 remove calls to drop() once wildcard index validation works. - coll.drop(); } -})(); +})(); \ No newline at end of file diff --git a/jstests/noPassthroughWithMongod/all_paths_index_multikey.js b/jstests/noPassthroughWithMongod/all_paths_index_multikey.js index 3c3f1a5aac8..93437827cf3 100644 --- a/jstests/noPassthroughWithMongod/all_paths_index_multikey.js +++ b/jstests/noPassthroughWithMongod/all_paths_index_multikey.js @@ -132,8 +132,5 @@ // Disable $** indexes once the tests have either completed or failed. assert.commandWorked( db.adminCommand({setParameter: 1, internalQueryAllowAllPathsIndexes: false})); - - // TODO: SERVER-36444 remove calls to drop() once wildcard index validation works. - coll.drop(); } })(); diff --git a/jstests/noPassthroughWithMongod/all_paths_partial_index.js b/jstests/noPassthroughWithMongod/all_paths_partial_index.js index c39b4be9fbc..8cd6f80c9db 100644 --- a/jstests/noPassthroughWithMongod/all_paths_partial_index.js +++ b/jstests/noPassthroughWithMongod/all_paths_partial_index.js @@ -54,8 +54,5 @@ } finally { // Disable $** indexes once the tests have either completed or failed. db.adminCommand({setParameter: 1, internalQueryAllowAllPathsIndexes: false}); - - // TODO: SERVER-36444 remove calls to drop() once wildcard index validation works. - coll.drop(); } })(); diff --git a/jstests/noPassthroughWithMongod/all_paths_validindex.js b/jstests/noPassthroughWithMongod/all_paths_validindex.js index fe108b64ba8..dc2802ce143 100644 --- a/jstests/noPassthroughWithMongod/all_paths_validindex.js +++ b/jstests/noPassthroughWithMongod/all_paths_validindex.js @@ -157,8 +157,5 @@ } finally { assert.commandWorked( db.adminCommand({"setParameter": 1, "internalQueryAllowAllPathsIndexes": false})); - - // TODO: SERVER-36444 remove calls to drop() once wildcard index validation works. - coll.drop(); } })(); -- cgit v1.2.1