diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8470ff51722..782f28ec034 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -242,14 +242,16 @@ jobs: - uses: taiki-e/install-action@v2 with: tool: nextest - - name: More writes_through_symlinks_are_prevented_even_if_overwriting_is_allowed reps + - name: Increase writes_through_symlinks_are_prevented_even_if_overwriting_is_allowed reps run: | # Prepend leading digits "24" to the upper bound of the label range. sed -Ei 's/^(#\[test_matrix\(0\.\.=)([[:digit:]]+\)])$/\124\2/' \ gix-worktree-state/tests/state/checkout.rs + - name: Display the changes made for this test + run: git diff - name: Test writes_through_symlinks_are_prevented_even_if_overwriting_is_allowed (nextest) run: | - cargo nextest run -p gix-worktree-state-tests \ + cargo nextest run -p gix-worktree-state-tests --no-default-features \ writes_through_symlinks_are_prevented_even_if_overwriting_is_allowed \ --status-level=fail --test-threads=${{ matrix.parallel-tests }} diff --git a/gix-worktree-state/tests/state/checkout.rs b/gix-worktree-state/tests/state/checkout.rs index 50ad0cd2d43..506b6471e06 100644 --- a/gix-worktree-state/tests/state/checkout.rs +++ b/gix-worktree-state/tests/state/checkout.rs @@ -689,10 +689,11 @@ fn probe_gitoxide_dir() -> crate::Result { fn opts_from_probe() -> gix_worktree_state::checkout::Options { static CAPABILITIES: Lazy = Lazy::new(|| probe_gitoxide_dir().unwrap()); + // FIXME(integration): Restore multithreaded `thread_limit` prior to merging #2008. gix_worktree_state::checkout::Options { fs: *CAPABILITIES, destination_is_initially_empty: true, - thread_limit: gix_features::parallel::num_threads(None).into(), + thread_limit: Some(1), // gix_features::parallel::num_threads(None).into(), ..Default::default() } }