youknowone · Sep 19, 2026 · Sep 18, 2026 · Sep 18, 2026 · Sep 18, 2026 · Sep 18, 2026
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -456,9 +456,6 @@
       RUST_BACKTRACE: full
       # Tests that can be flaky when running with multiple processes `-j 2`. We will use `-j 1` for these.
       FLAKY_MP_TESTS: >-
-        test_class
-        test_concurrent_futures
-        test_eintr
         test_multiprocessing_fork
         test_multiprocessing_forkserver
         test_multiprocessing_spawn
@@ -475,6 +472,7 @@
             - '-u all'
             - '--timeout 600'
             - '--dont-add-python-opts'
+          extra_flaky_mp_tests: []
           env_polluting_tests: []
           skips: []
           timeout: 50
@@ -483,6 +481,7 @@
             - '-u all'
             - '--timeout 600'
             - '--dont-add-python-opts'
+          extra_flaky_mp_tests: []
           env_polluting_tests: []
           skips: []
           timeout: 60
@@ -491,6 +490,7 @@
             - '-u all'
             - '--timeout 600'
             - '--dont-add-python-opts'
+          extra_flaky_mp_tests: []
           env_polluting_tests: []
           skips: []
           timeout: 50
@@ -551,19 +551,24 @@
          echo "cores=${cores}" >> "$GITHUB_OUTPUT"
 
       - name: Run CPython tests
         run: |
-          target/release/rustpython -u -m test --slow-ci -j ${{ steps.cores.outputs.cores }} ${{ join(matrix.extra_test_args, ' ') }} -x ${{ env.FLAKY_MP_TESTS }} ${{ join(matrix.skips, ' ') }}
+          target/release/rustpython -u -m test --slow-ci -j "$CORES" $EXTRA_TEST_ARGS -x $FLAKY_MP_TESTS $EXTRA_FLAKY_MP_TESTS $SKIPS
         timeout-minutes: ${{ matrix.timeout }}
+        shell: bash
         env:
           RUSTPYTHON_SKIP_ENV_POLLUTERS: true
+          CORES: ${{ steps.cores.outputs.cores }}
+          EXTRA_TEST_ARGS: ${{ join(matrix.extra_test_args, ' ') }}
+          EXTRA_FLAKY_MP_TESTS: ${{ join(matrix.extra_flaky_mp_tests, ' ') }}
+          SKIPS: ${{ join(matrix.skips, ' ') }}
 
       - name: Run flaky MP CPython tests
         run: |
           for attempt in $(seq 1 5); do
             echo "::group::Attempt ${attempt}"
 
             set +e
-            target/release/rustpython -u -m test --slow-ci -j 1 ${{ join(matrix.extra_test_args, ' ') }} ${{ env.FLAKY_MP_TESTS }}
+            target/release/rustpython -u -m test --slow-ci -j 1 $EXTRA_TEST_ARGS $FLAKY_MP_TESTS $EXTRA_FLAKY_MP_TESTS
             status=$?
             set -e
 
@@ -579,6 +584,8 @@
         shell: bash
         env:
           RUSTPYTHON_SKIP_ENV_POLLUTERS: true
+          EXTRA_TEST_ARGS: ${{ join(matrix.extra_test_args, ' ') }}
+          EXTRA_FLAKY_MP_TESTS: ${{ join(matrix.extra_flaky_mp_tests, ' ') }}
 
       - name: run cpython tests to check if env polluters have stopped polluting
         shell: bash
@@ -737,12 +744,13 @@
 
       - uses: dtolnay/rust-toolchain@stable
 
-      - uses: cargo-bins/cargo-binstall@b874e25ea559687bec77e281e9b271aa1367b624 # v1.23.0
+      - uses: taiki-e/install-action@d438492cf8a250514fa2d34b30bc3c0dc37c65ff # v2.87.8
+        with:
+          tool: cargo-shear
+          fallback: none
 
       - name: cargo shear
-        run: |
-          cargo binstall --no-confirm cargo-shear
-          cargo shear --locked
+        run: cargo shear --locked
 
   lint:
     name: Lint

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
@@ -1606,7 +1606,6 @@ def _acquire_release(lock, timeout, l=None, n=1):
         for _ in range(n):
             lock.release()
 
-    @unittest.skip("TODO: RUSTPYTHON; flaky timeout - thread start latency")
     def test_repr_rlock(self):
         if self.TYPE != 'processes':
             self.skipTest('test not appropriate for {}'.format(self.TYPE))

diff --git a/Lib/test/test_concurrent_futures/test_shutdown.py b/Lib/test/test_concurrent_futures/test_shutdown.py
@@ -255,11 +255,6 @@ def test_cancel_futures_wait_false(self):
 
 
 class ProcessPoolShutdownTest(ExecutorShutdownTest):
-    # TODO: RUSTPYTHON - flaky, dict changed size during iteration race condition
-    @unittest.skip("TODO: RUSTPYTHON - flaky race condition on macOS")
-    def test_cancel_futures(self):
-        return super().test_cancel_futures()
-
     def test_processes_terminate(self):
         def acquire_lock(lock):
             lock.acquire()

diff --git a/benches/benchmarks/gc_collect.py b/benches/benchmarks/gc_collect.py
diff --git a/tests/benchmark_scripts.rs b/tests/benchmark_scripts.rs
@@ -8,7 +8,6 @@ const PYPERFORMANCE_BENCHMARKS: &[&str] = &[
     "deepcopy.py",
     "deltablue.py",
     "float.py",
-    "gc_collect.py",
     "gc_traversal.py",
     "generators.py",
     "json_dumps.py",