SERVER-43469 Remove TODOs listed for SERVER-35447

26 files changed, 33 insertions, 33 deletions

diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
index 96e04aad414..14d4c698e5d 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
@@ -134,7 +134,7 @@ selector:
   # "Cowardly refusing to run test with overridden read preference when it reads from a
   #  non-replicated collection: ..."
   - assumes_read_preference_unchanged
-  # TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+  # Multiple users cannot be authenticated on one connection within a session.
   - creates_and_authenticates_user
   - does_not_support_causal_consistency
   - requires_collstats
diff --git a/buildscripts/resmokeconfig/suites/core_auth.yml b/buildscripts/resmokeconfig/suites/core_auth.yml
index 32a3816a93d..17d4cf37440 100644
--- a/buildscripts/resmokeconfig/suites/core_auth.yml
+++ b/buildscripts/resmokeconfig/suites/core_auth.yml
@@ -21,7 +21,7 @@ selector:
   # Commands using UUIDs are not compatible with name-based auth
   - jstests/core/commands_with_uuid.js
   exclude_with_any_tags:
-  # TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+  # Multiple users cannot be authenticated on one connection within a session.
   - creates_and_authenticates_user
 
 executor:
diff --git a/jstests/auth/auth1.js b/jstests/auth/auth1.js
index f636403c6c0..64ab9d661ce 100644
--- a/jstests/auth/auth1.js
+++ b/jstests/auth/auth1.js
@@ -2,7 +2,7 @@
 // skip this test on 32-bit platforms
 // @tags: [requires_profiling]
 
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 function setupTest() {
diff --git a/jstests/auth/authentication_restrictions.js b/jstests/auth/authentication_restrictions.js
index 456fe1465e1..9de899ef592 100644
--- a/jstests/auth/authentication_restrictions.js
+++ b/jstests/auth/authentication_restrictions.js
@@ -6,7 +6,7 @@
 (function() {
 'use strict';
 
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 function testConnection(
diff --git a/jstests/auth/authentication_restrictions_role.js b/jstests/auth/authentication_restrictions_role.js
index e861718554f..60a43d8565a 100644
--- a/jstests/auth/authentication_restrictions_role.js
+++ b/jstests/auth/authentication_restrictions_role.js
@@ -6,7 +6,7 @@
 (function() {
 'use strict';
 
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 function testRestrictionCreationAndEnforcement(
diff --git a/jstests/auth/commands_builtin_roles.js b/jstests/auth/commands_builtin_roles.js
index a362b5eb6f3..d1aed300029 100644
--- a/jstests/auth/commands_builtin_roles.js
+++ b/jstests/auth/commands_builtin_roles.js
@@ -9,8 +9,8 @@ in jstests/auth/lib/commands_lib.js
 
 */
 
-// TODO SERVER-35447: This test involves killing all sessions, which will not work as expected if
-// the kill command is sent with an implicit session.
+// This test involves killing all sessions, which will not work as expected if the kill command is
+// sent with an implicit session.
 TestData.disableImplicitSessions = true;
 
 load("jstests/auth/lib/commands_lib.js");
diff --git a/jstests/auth/commands_user_defined_roles.js b/jstests/auth/commands_user_defined_roles.js
index 8b7650a6cee..ea9e3d7d94e 100644
--- a/jstests/auth/commands_user_defined_roles.js
+++ b/jstests/auth/commands_user_defined_roles.js
@@ -9,8 +9,8 @@ in jstests/auth/lib/commands_lib.js.
 
 */
 
-// TODO SERVER-35447: This test involves killing all sessions, which will not work as expected if
-// the kill command is sent with an implicit session.
+// This test involves killing all sessions, which will not work as expected if the kill command is
+// sent with an implicit session.
 TestData.disableImplicitSessions = true;
 
 // constants
diff --git a/jstests/auth/getMore.js b/jstests/auth/getMore.js
index 26ec6a2783a..93570d6556f 100644
--- a/jstests/auth/getMore.js
+++ b/jstests/auth/getMore.js
@@ -3,7 +3,7 @@
 (function() {
 "use strict";
 
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 function runTest(conn) {
diff --git a/jstests/auth/kill_cursors.js b/jstests/auth/kill_cursors.js
index bb31721e860..ee791320520 100644
--- a/jstests/auth/kill_cursors.js
+++ b/jstests/auth/kill_cursors.js
@@ -3,7 +3,7 @@
 (function() {
 'use strict';
 
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 function runTest(mongod) {
diff --git a/jstests/auth/kill_sessions.js b/jstests/auth/kill_sessions.js
index 99ddc51296f..a2f74d91b85 100644
--- a/jstests/auth/kill_sessions.js
+++ b/jstests/auth/kill_sessions.js
@@ -3,8 +3,8 @@ load("jstests/libs/kill_sessions.js");
 (function() {
 'use strict';
 
-// TODO SERVER-35447: This test involves killing all sessions, which will not work as expected
-// if the kill command is sent with an implicit session.
+// This test involves killing all sessions, which will not work as expected if the kill command is
+// sent with an implicit session.
 TestData.disableImplicitSessions = true;
 
 var forExec = MongoRunner.runMongod({auth: ""});
diff --git a/jstests/auth/rename.js b/jstests/auth/rename.js
index 0ae3eac3113..4bc25d1053d 100644
--- a/jstests/auth/rename.js
+++ b/jstests/auth/rename.js
@@ -1,6 +1,6 @@
 // test renameCollection with auth
 
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 var m = MongoRunner.runMongod({auth: ""});
diff --git a/jstests/auth/resource_pattern_matching.js b/jstests/auth/resource_pattern_matching.js
index 3a8fe24c957..34fb4309155 100644
--- a/jstests/auth/resource_pattern_matching.js
+++ b/jstests/auth/resource_pattern_matching.js
@@ -3,9 +3,9 @@
  * @tags: [requires_replication, requires_sharding]
  */
 
-// TODO SERVER-35447: This test logs in users on the admin database, but doesn't log them out, which
-// can fail with implicit sessions and ReplSetTest when the fixture attempts to verify data hashes
-// at shutdown by authenticating as the __system user.
+// This test logs in users on the admin database, but doesn't log them out, which can fail with
+// implicit sessions and ReplSetTest when the fixture attempts to verify data hashes at shutdown by
+// authenticating as the __system user.
 TestData.disableImplicitSessions = true;
 
 function setup_users(granter) {
diff --git a/jstests/auth/views_authz.js b/jstests/auth/views_authz.js
index eaab62647cb..25093191628 100644
--- a/jstests/auth/views_authz.js
+++ b/jstests/auth/views_authz.js
@@ -6,7 +6,7 @@
 (function() {
 "use strict";
 
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 function runTest(conn) {
diff --git a/jstests/noPassthrough/kill_sessions.js b/jstests/noPassthrough/kill_sessions.js
index f0e7a05a4ba..81a79a2e6ea 100644
--- a/jstests/noPassthrough/kill_sessions.js
+++ b/jstests/noPassthrough/kill_sessions.js
@@ -3,8 +3,8 @@ load("jstests/libs/kill_sessions.js");
 (function() {
 'use strict';
 
-// TODO SERVER-35447: This test involves killing all sessions, which will not work as expected
-// if the kill command is sent with an implicit session.
+// This test involves killing all sessions, which will not work as expected if the kill command is
+// sent with an implicit session.
 TestData.disableImplicitSessions = true;
 
 var conn = MongoRunner.runMongod();
diff --git a/jstests/replsets/auth1.js b/jstests/replsets/auth1.js
index 04d4742246c..c39bdd3e254 100644
--- a/jstests/replsets/auth1.js
+++ b/jstests/replsets/auth1.js
@@ -8,7 +8,7 @@ load("jstests/replsets/rslib.js");
 (function() {
 "use strict";
 
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 var name = "rs_auth1";
diff --git a/jstests/replsets/rollback_auth.js b/jstests/replsets/rollback_auth.js
index e85ce9b8082..edd5b141c45 100644
--- a/jstests/replsets/rollback_auth.js
+++ b/jstests/replsets/rollback_auth.js
@@ -20,7 +20,7 @@
 // TODO SERVER-32639: remove this flag.
 TestData.skipGossipingClusterTime = true;
 
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 // helper function for verifying contents at the end of the test
diff --git a/jstests/replsets/user_management_wc.js b/jstests/replsets/user_management_wc.js
index f4e755b6f7e..6d782fa1536 100644
--- a/jstests/replsets/user_management_wc.js
+++ b/jstests/replsets/user_management_wc.js
@@ -11,7 +11,7 @@ load('jstests/multiVersion/libs/auth_helpers.js');
 (function() {
 "use strict";
 
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 var replTest =
diff --git a/jstests/sharding/advance_cluster_time_action_type.js b/jstests/sharding/advance_cluster_time_action_type.js
index fb3f1184e84..238eb774f77 100644
--- a/jstests/sharding/advance_cluster_time_action_type.js
+++ b/jstests/sharding/advance_cluster_time_action_type.js
@@ -5,7 +5,7 @@
 (function() {
 "use strict";
 
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 let st = new ShardingTest({mongos: 1, config: 1, shards: 1, keyFile: 'jstests/libs/key1'});
diff --git a/jstests/sharding/authCommands.js b/jstests/sharding/authCommands.js
index 6c3f905f266..7c799d6c3e5 100644
--- a/jstests/sharding/authCommands.js
+++ b/jstests/sharding/authCommands.js
@@ -4,7 +4,7 @@
 (function() {
 'use strict';
 
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 load("jstests/replsets/rslib.js");
diff --git a/jstests/sharding/auth_repl.js b/jstests/sharding/auth_repl.js
index 5605225b446..cd89c91f136 100644
--- a/jstests/sharding/auth_repl.js
+++ b/jstests/sharding/auth_repl.js
@@ -1,4 +1,4 @@
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 var replTest = new ReplSetTest({nodes: 3, useHostName: false, keyFile: 'jstests/libs/key1'});
diff --git a/jstests/sharding/cleanup_orphaned_auth.js b/jstests/sharding/cleanup_orphaned_auth.js
index 8b0fac00f5d..cb4490ec00b 100644
--- a/jstests/sharding/cleanup_orphaned_auth.js
+++ b/jstests/sharding/cleanup_orphaned_auth.js
@@ -5,7 +5,7 @@
 (function() {
 'use strict';
 
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 function assertUnauthorized(res, msg) {
diff --git a/jstests/sharding/commands_that_write_accept_wc_configRS.js b/jstests/sharding/commands_that_write_accept_wc_configRS.js
index 95a84f32532..1dae32155fd 100644
--- a/jstests/sharding/commands_that_write_accept_wc_configRS.js
+++ b/jstests/sharding/commands_that_write_accept_wc_configRS.js
@@ -17,7 +17,7 @@ load('jstests/multiVersion/libs/auth_helpers.js');
 (function() {
 "use strict";
 
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 var st = new ShardingTest({
diff --git a/jstests/sharding/kill_sessions.js b/jstests/sharding/kill_sessions.js
index f9e32a8ea7d..583bb4c6352 100644
--- a/jstests/sharding/kill_sessions.js
+++ b/jstests/sharding/kill_sessions.js
@@ -11,8 +11,8 @@ load("jstests/libs/kill_sessions.js");
 (function() {
 'use strict';
 
-// TODO SERVER-35447: This test involves killing all sessions, which will not work as expected
-// if the kill command is sent with an implicit session.
+// This test involves killing all sessions, which will not work as expected if the kill command is
+// sent with an implicit session.
 TestData.disableImplicitSessions = true;
 
 function runTests(needAuth) {
diff --git a/jstests/sharding/mongos_rs_auth_shard_failure_tolerance.js b/jstests/sharding/mongos_rs_auth_shard_failure_tolerance.js
index 30b81200c38..5cb277197b1 100644
--- a/jstests/sharding/mongos_rs_auth_shard_failure_tolerance.js
+++ b/jstests/sharding/mongos_rs_auth_shard_failure_tolerance.js
@@ -24,7 +24,7 @@ TestData.skipCheckOrphans = true;
 // time later in setup.
 //
 
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 var options = {rs: true, rsOptions: {nodes: 2}, keyFile: "jstests/libs/key1"};
diff --git a/jstests/sharding/query/mrShardedOutputAuth.js b/jstests/sharding/query/mrShardedOutputAuth.js
index 3a14079d065..19e7f6a8b01 100644
--- a/jstests/sharding/query/mrShardedOutputAuth.js
+++ b/jstests/sharding/query/mrShardedOutputAuth.js
@@ -6,7 +6,7 @@
 
 "use strict";
 
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 const st = new ShardingTest(
     {name: "mrShardedOutputAuth", shards: 1, mongos: 1, other: {keyFile: 'jstests/libs/key1'}});
diff --git a/jstests/sharding/sharding_options.js b/jstests/sharding/sharding_options.js
index 0703a784eff..6acf2361729 100644
--- a/jstests/sharding/sharding_options.js
+++ b/jstests/sharding/sharding_options.js
@@ -1,4 +1,4 @@
-// TODO SERVER-35447: Multiple users cannot be authenticated on one connection within a session.
+// Multiple users cannot be authenticated on one connection within a session.
 TestData.disableImplicitSessions = true;
 
 var baseName = "jstests_sharding_sharding_options";