RUST-1412 sync StaleShardVersion test and remove skip (#706)

Author: kmahar

src/test/spec/change_streams.rs

@@ -1,20 +1,13 @@
-use crate::test::{run_spec_test, TestClient, LOCK};
+use crate::test::{run_spec_test, LOCK};
 
-use super::{run_unified_format_test_filtered, unified_runner::TestCase};
+use super::run_unified_format_test;
 
 #[cfg_attr(feature = "tokio-runtime", tokio::test(flavor = "multi_thread"))] // multi_thread required for FailPoint
 #[cfg_attr(feature = "async-std-runtime", async_std::test)]
 async fn run() {
     let _guard = LOCK.run_exclusively().await;
-    let client = TestClient::new().await;
-    // TODO RUST-1412: remove this skip.
-    let is_gte_6_1 = client.server_version_gte(6, 1);
-    let pred = |tc: &TestCase| {
-        !(is_gte_6_1 && tc.description == "change stream resumes after StaleShardVersion")
-    };
-
     run_spec_test(&["change-streams", "unified"], |f| {
-        run_unified_format_test_filtered(f, pred)
+        run_unified_format_test(f)
     })
     .await;
 }

src/test/spec/json/change-streams/unified/change-streams-resume-errorLabels.json

@@ -1478,6 +1478,11 @@
     },
     {
       "description": "change stream resumes after StaleShardVersion",
+      "runOnRequirements": [
+        {
+          "maxServerVersion": "6.0.99"
+        }
+      ],
       "operations": [
         {
           "name": "failPoint",

src/test/spec/json/change-streams/unified/change-streams-resume-errorLabels.yml

@@ -743,6 +743,9 @@ tests:
               databaseName: *database0
 
   - description: change stream resumes after StaleShardVersion
+    runOnRequirements:
+      # StaleShardVersion is obsolete as of 6.1 and is no longer marked as resumable.
+      - maxServerVersion: "6.0.99"
     operations:
       - name: failPoint
         object: testRunner