SERVER-31937 de-blacklist kill_sessions.js

9 files changed, 1 insertions, 19 deletions

diff --git a/buildscripts/resmokeconfig/suites/sharding.yml b/buildscripts/resmokeconfig/suites/sharding.yml
index 10690dba6e6..ce952617352 100644
--- a/buildscripts/resmokeconfig/suites/sharding.yml
+++ b/buildscripts/resmokeconfig/suites/sharding.yml
@@ -3,9 +3,6 @@ test_kind: js_test
 selector:
   roots:
   - jstests/sharding/*.js
-  exclude_files:
-  # TODO: SERVER-31937
-  - jstests/sharding/kill_sessions.js
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/sharding_ese.yml b/buildscripts/resmokeconfig/suites/sharding_ese.yml
index a6ec7128e87..d8d620384a1 100644
--- a/buildscripts/resmokeconfig/suites/sharding_ese.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_ese.yml
@@ -7,9 +7,6 @@ test_kind: js_test
 selector:
   roots:
   - jstests/sharding/*.js
-  exclude_files:
-  # TODO: SERVER-31937
-  - jstests/sharding/kill_sessions.js
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
index 94664da3a44..f69170b19be 100644
--- a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
@@ -68,8 +68,6 @@ selector:
   - jstests/sharding/resume_change_stream.js
   # Requires count command to be accurate on sharded clusters, introduced in v4.0.
   - jstests/sharding/accurate_count_with_predicate.js
-  # Disabled throughout sharding. See SERVER-31937 for details.
-  - jstests/sharding/kill_sessions.js
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/sharding_misc.yml b/buildscripts/resmokeconfig/suites/sharding_misc.yml
index 1d4c17b0cf8..235d21c3a0d 100644
--- a/buildscripts/resmokeconfig/suites/sharding_misc.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_misc.yml
@@ -10,8 +10,6 @@ selector:
   roots:
   - jstests/sharding/*.js
   exclude_files:
-  # TODO: SERVER-31937
-  - jstests/sharding/kill_sessions.js
   - jstests/sharding/mongos_rs_shard_failure_tolerance.js
   - jstests/sharding/top_chunk_autosplit.js
   - jstests/sharding/mongos_rs_auth_shard_failure_tolerance.js
@@ -385,4 +383,4 @@ executor:
   config:
     shell_options:
       nodb: ''
-      readMode: commands
\ No newline at end of file
+      readMode: commands
diff --git a/buildscripts/templates/generate_resmoke_suites/sharding.yml.j2 b/buildscripts/templates/generate_resmoke_suites/sharding.yml.j2
index dba294fb77f..f680444cbbc 100644
--- a/buildscripts/templates/generate_resmoke_suites/sharding.yml.j2
+++ b/buildscripts/templates/generate_resmoke_suites/sharding.yml.j2
@@ -22,8 +22,6 @@ selector:
 {% endif %}
 {% if excluded_tests is defined %}
   exclude_files:
-  # TODO: SERVER-31937
-  - jstests/sharding/kill_sessions.js
 {% for test in excluded_tests %}
   - {{ test }}
 {% endfor %}
diff --git a/buildscripts/templates/generate_resmoke_suites/sharding_ese.yml.j2 b/buildscripts/templates/generate_resmoke_suites/sharding_ese.yml.j2
index b976a89941a..16cd54389e4 100644
--- a/buildscripts/templates/generate_resmoke_suites/sharding_ese.yml.j2
+++ b/buildscripts/templates/generate_resmoke_suites/sharding_ese.yml.j2
@@ -25,8 +25,6 @@ selector:
 {% if is_misc is defined %}
   - jstests/sharding/*.js
   exclude_files:
-  # TODO: SERVER-31937
-  - jstests/sharding/kill_sessions.js
 {% if excluded_tests is defined %}
 {% for test in excluded_tests %}
   - {{ test }}
diff --git a/buildscripts/templates/generate_resmoke_suites/sharding_last_stable_mongos_and_mixed_shards.yml.j2 b/buildscripts/templates/generate_resmoke_suites/sharding_last_stable_mongos_and_mixed_shards.yml.j2
index 82f69472431..53ff9071785 100644
--- a/buildscripts/templates/generate_resmoke_suites/sharding_last_stable_mongos_and_mixed_shards.yml.j2
+++ b/buildscripts/templates/generate_resmoke_suites/sharding_last_stable_mongos_and_mixed_shards.yml.j2
@@ -84,8 +84,6 @@ selector:
   - jstests/sharding/resume_change_stream.js
   # Requires count command to be accurate on sharded clusters, introduced in v4.0.
   - jstests/sharding/accurate_count_with_predicate.js
-  # Disabled throughout sharding. See SERVER-31937 for details.
-  - jstests/sharding/kill_sessions.js
 {% if excluded_tests is defined %}
 {% for test in excluded_tests %}
   - {{ test }}
diff --git a/jstests/sharding/kill_sessions.js b/jstests/sharding/kill_sessions.js
index 2757ef8935d..d5bb39213f1 100644
--- a/jstests/sharding/kill_sessions.js
+++ b/jstests/sharding/kill_sessions.js
@@ -6,7 +6,6 @@ load("jstests/libs/kill_sessions.js");
     function runTests(needAuth) {
         var other = {
             rs: true,
-            rsOptions: {nojournal: ""},
             rs0: {nodes: 3},
             rs1: {nodes: 3},
         };
diff --git a/src/mongo/shell/utils_auth.js b/src/mongo/shell/utils_auth.js
index 1ec8d9bbae5..065d0360860 100644
--- a/src/mongo/shell/utils_auth.js
+++ b/src/mongo/shell/utils_auth.js
@@ -120,7 +120,6 @@ var authutil;
                     connElem._getDefaultSession().resetClusterTime_forTesting();
                     connElem._getDefaultSession().resetOperationTime_forTesting();
                     if (clusterTimes[i].connClusterTime) {
-                        jsTestLog("Restoring clusterTime: " + tojson(clusterTimes[i].connClusterTime));
                         connElem.advanceClusterTime(clusterTimes[i].connClusterTime);
                     }
                     if (clusterTimes[i].sessionClusterTime) {