From bd809ce905a837f9eda6c8cd9cbf6ce57e4eee9b Mon Sep 17 00:00:00 2001 From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Fri, 26 Jun 2026 20:28:25 +0300 Subject: [PATCH 1/4] Set python args to be like CPython in CI (ish) --- .github/workflows/ci.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 72599d28703..5b5eac3f886 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -34,6 +34,7 @@ env: CARGO_PROFILE_RELEASE_DEBUG: 0 CARGO_TERM_COLOR: always CI: true + FORCE_COLOR: 1 jobs: determine_changes: @@ -359,7 +360,7 @@ jobs: - name: Run CPython tests run: | - target/release/rustpython -m test -j ${{ steps.cores.outputs.cores }} ${{ join(matrix.extra_test_args, ' ') }} --slowest --fail-env-changed --timeout 600 -v -x ${{ env.FLAKY_MP_TESTS }} ${{ join(matrix.skips, ' ') }} + target/release/rustpython -u -m test -j ${{ steps.cores.outputs.cores }} ${{ join(matrix.extra_test_args, ' ') }} --slowest --fail-env-changed --timeout 600 -x ${{ env.FLAKY_MP_TESTS }} ${{ join(matrix.skips, ' ') }} timeout-minutes: ${{ matrix.timeout }} env: RUSTPYTHON_SKIP_ENV_POLLUTERS: true @@ -370,7 +371,7 @@ jobs: echo "::group::Attempt ${attempt}" set +e - target/release/rustpython -m test -j 1 ${{ join(matrix.extra_test_args, ' ') }} --slowest --fail-env-changed --timeout 600 -v ${{ env.FLAKY_MP_TESTS }} + target/release/rustpython -u -m test -j 1 ${{ join(matrix.extra_test_args, ' ') }} --slowest --fail-env-changed --timeout 600 ${{ env.FLAKY_MP_TESTS }} status=$? set -e @@ -395,7 +396,7 @@ jobs: for thing in "${target_array[@]}"; do for i in $(seq 1 10); do set +e - target/release/rustpython -m test -j 1 --slowest --fail-env-changed --timeout 600 -v "${thing}" + target/release/rustpython -u -m test -j 1 --slowest --fail-env-changed --timeout 600 "${thing}" exit_code=$? set -e if [ "${exit_code}" -eq 3 ]; then From 128cee94a6207a1c3307c55255f99ba680022dd9 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Sat, 27 Jun 2026 11:55:37 +0300 Subject: [PATCH 2/4] Use `--slow-ci` --- .github/workflows/ci.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5b5eac3f886..9661a51f8b7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -295,6 +295,7 @@ jobs: - os: macos-latest extra_test_args: - '-u all' + - '--timeout 600' env_polluting_tests: - test_set skips: [] @@ -302,6 +303,7 @@ jobs: - os: ubuntu-latest extra_test_args: - '-u all' + - '--timeout 600' env_polluting_tests: - test_set skips: [] @@ -309,6 +311,7 @@ jobs: - os: windows-2025 extra_test_args: - '-u all' + - '--timeout 600' env_polluting_tests: - test_set skips: [] @@ -360,7 +363,7 @@ jobs: - name: Run CPython tests run: | - target/release/rustpython -u -m test -j ${{ steps.cores.outputs.cores }} ${{ join(matrix.extra_test_args, ' ') }} --slowest --fail-env-changed --timeout 600 -x ${{ env.FLAKY_MP_TESTS }} ${{ join(matrix.skips, ' ') }} + 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, ' ') }} timeout-minutes: ${{ matrix.timeout }} env: RUSTPYTHON_SKIP_ENV_POLLUTERS: true @@ -371,7 +374,7 @@ jobs: echo "::group::Attempt ${attempt}" set +e - target/release/rustpython -u -m test -j 1 ${{ join(matrix.extra_test_args, ' ') }} --slowest --fail-env-changed --timeout 600 ${{ env.FLAKY_MP_TESTS }} + target/release/rustpython -u -m test --slow-ci -j 1 ${{ join(matrix.extra_test_args, ' ') }} ${{ env.FLAKY_MP_TESTS }} status=$? set -e @@ -396,7 +399,7 @@ jobs: for thing in "${target_array[@]}"; do for i in $(seq 1 10); do set +e - target/release/rustpython -u -m test -j 1 --slowest --fail-env-changed --timeout 600 "${thing}" + target/release/rustpython -u -m test --slow-ci -u all -j 1 --timeout 600 "${thing}" exit_code=$? set -e if [ "${exit_code}" -eq 3 ]; then From 74aca0cdfa806cff54170857b2eb262fbc30e005 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Sat, 27 Jun 2026 12:16:31 +0300 Subject: [PATCH 3/4] `--dont-add-python-opts` --- .github/workflows/ci.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9661a51f8b7..e128531a604 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -296,6 +296,7 @@ jobs: extra_test_args: - '-u all' - '--timeout 600' + - '--dont-add-python-opts' env_polluting_tests: - test_set skips: [] @@ -304,6 +305,7 @@ jobs: extra_test_args: - '-u all' - '--timeout 600' + - '--dont-add-python-opts' env_polluting_tests: - test_set skips: [] @@ -312,6 +314,7 @@ jobs: extra_test_args: - '-u all' - '--timeout 600' + - '--dont-add-python-opts' env_polluting_tests: - test_set skips: [] @@ -399,7 +402,7 @@ jobs: for thing in "${target_array[@]}"; do for i in $(seq 1 10); do set +e - target/release/rustpython -u -m test --slow-ci -u all -j 1 --timeout 600 "${thing}" + target/release/rustpython -u -m test --slow-ci -u all -j 1 --timeout 600 --dont-add-python-opts "${thing}" exit_code=$? set -e if [ "${exit_code}" -eq 3 ]; then From 7b47348f0b87e6990b2f67d5b337413062ba4e28 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Sat, 27 Jun 2026 12:58:13 +0300 Subject: [PATCH 4/4] unmark passing test --- Lib/test/test_future_stmt/test_future.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Lib/test/test_future_stmt/test_future.py b/Lib/test/test_future_stmt/test_future.py index 8d2050a3936..02690919cf3 100644 --- a/Lib/test/test_future_stmt/test_future.py +++ b/Lib/test/test_future_stmt/test_future.py @@ -177,7 +177,6 @@ def test_unicode_literals_exec(self): exec("from __future__ import unicode_literals; x = ''", {}, scope) self.assertIsInstance(scope["x"], str) - @unittest.expectedFailure # TODO: RUSTPYTHON; barry_as_FLUFL (<> operator) not supported def test_syntactical_future_repl(self): p = spawn_python('-i') p.stdin.write(b"from __future__ import barry_as_FLUFL\n")