tests: make UserConfig unit tests concurrency-safe with unique tempiles by ulysses4ever · Pull Request #11759 · haskell/cabal

ulysses4ever · 2026-04-20T17:33:36Z

Fix #11686. Created with Copilot.

Template B: This PR does not modify behaviour or interface

E.g. the PR only touches documentation or tests, does refactorings, etc.

Include the following checklist in your PR:

Patches conform to the coding conventions.
Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

Bodigrim · 2026-04-20T18:11:47Z

It adds some more cleanup than strictly what #11686 asks for (the teardown function removes some extra *.tmp files) but it looks legit: it addresses this logic in Distribution.Client.Config

Rather than work around it in the test suite, let's fix Distribution.Client.Config: the shenanigans with tmpFile are ill advised, just createDirectoryIfMissing and immediately writeFileAtomic file.

geekosaur · 2026-04-20T20:40:17Z

FWIW I agree with Bodigrim.

ulysses4ever · 2026-04-21T13:54:32Z

@Bodigrim done. There's also a new test that tries to concurrently create user configs. Let me know if it doesn't make sense, I can remove it.

Bodigrim · 2026-04-21T19:05:26Z

There's also a new test that tries to concurrently create user configs. Let me know if it doesn't make sense, I can remove it.

It does not make sense to me.

ulysses4ever · 2026-04-21T19:09:46Z

@Bodigrim very well, the test is removed. The only potentially slippery spot I can think of is the bytestring-management business that had to be added for writeFileAtomic (writeFileAtomic file $ LBS.fromStrict . toUTF8BS $ ...). If there's a beter way to get it done, let me know. Otherwise this should be ready hopefully.

Bodigrim · 2026-04-21T19:19:10Z

If there's a beter way to get it done, let me know.

One can construct StrictByteString directly (by replacing Disp.render in showConfigWithComments with Disp.fullRender), but this perhaps goes beyond the scope of the issue. I'm fine either way.

philderbeast · 2026-04-21T19:30:50Z

@ulysses4ever this seems to have fixed the problem with #11686. After a few runs, maybe the 4th, I got this error:

$ cabal test cabal-install:unit-tests
...
    getProjectRootUsability
      relative path:                                                                                                FAIL (0.02s)
        tests/UnitTests/Distribution/Client/ProjectConfig.hs:122:
        expected: ProjectRootUsabilityPresentAndUsable
         but got: ProjectRootUsabilityNotPresent
        Use -p '/relative path/' to rerun this test only.

Bodigrim · 2026-04-21T19:47:22Z

After a few runs, maybe the 4th, I got this error...

AFAICT this is not a regression caused by this PR, but rather another facet of upgrade to tasty-1.5.4: running testGetProjectRootUsability concurrently is expected to fail. I'd suggest to raise a separate ticket.

ulysses4ever · 2026-04-21T20:02:32Z

@Bodigrim

but this perhaps goes beyond the scope of the issue. I'm fine either way.

I'd then stick to what's there currently.

…iles (#26) tests: use unique temp files in UserConfig bracketTest Agent-Logs-Url: https://github.com/ulysses4ever/cabal/sessions/043e3696-3cda-43aa-aa50-e483ec531d13 Co-authored-by: ulysses4ever <6832600+ulysses4ever@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: ulysses4ever <6832600+ulysses4ever@users.noreply.github.com>

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: ulysses4ever <6832600+ulysses4ever@users.noreply.github.com>

ulysses4ever · 2026-04-23T14:36:23Z

CI is green now.

philderbeast · 2026-04-23T14:45:36Z

AFAICT this is not a regression caused by this PR, but rather another facet of upgrade to tasty-1.5.4: running testGetProjectRootUsability concurrently is expected to fail. I'd suggest to raise a separate ticket.

I tried many times and couldn't reproduce this error. Leaving it for now but will log it if I see it again.

Mikolaj

LGTM

mergify · 2026-04-25T17:48:47Z

ulysses4ever mentioned this pull request Apr 20, 2026

"resource busy (file is locked)" failures running tests locally #11686

Closed

ulysses4ever requested a review from Bodigrim April 20, 2026 18:37

ulysses4ever added the attention: needs-review label Apr 20, 2026

ulysses4ever mentioned this pull request Apr 21, 2026

use writeFileAtomic in Distribution.Client.Config ulysses4ever/cabal#27

Closed

Copilot AI mentioned this pull request Apr 21, 2026

Use writeFileAtomic in Distribution.Client.Config and remove .tmp workaround ulysses4ever/cabal#28

Merged

6 tasks

ulysses4ever added attention: needs-review and removed attention: needs-review labels Apr 21, 2026

ulysses4ever force-pushed the master branch from e9f5686 to 54f7578 Compare April 22, 2026 14:46

Copilot AI and others added 6 commits April 22, 2026 22:21

Use writeFileAtomic in Distribution.Client.Config

16d6865

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: ulysses4ever <6832600+ulysses4ever@users.noreply.github.com>

Put renameFile back

88d026c

Import replicateM in UserConfig.hs

4d62af3

Remove concurrentUpdateConfig test case

1e2668d

fixup! unused imports

d09efbe

ulysses4ever force-pushed the master branch from 54f7578 to d09efbe Compare April 23, 2026 02:21

philderbeast mentioned this pull request Apr 23, 2026

active-repositories: Don't override fully-deprecated packages #11760

Open

6 tasks

ulysses4ever requested review from geekosaur and philderbeast April 23, 2026 14:36

philderbeast approved these changes Apr 23, 2026

View reviewed changes

jappeace approved these changes Apr 23, 2026

View reviewed changes

Mikolaj approved these changes Apr 23, 2026

View reviewed changes

Mikolaj added the squash+merge me Tell Mergify Bot to squash-merge label Apr 23, 2026

mergify Bot added the ready and waiting Mergify is waiting out the cooldown period label Apr 23, 2026

ffaf1 approved these changes Apr 23, 2026

View reviewed changes

mergify Bot added merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days queued labels Apr 25, 2026

mergify Bot merged commit ff9daa2 into haskell:master Apr 25, 2026
209 checks passed

mergify Bot removed the queued label Apr 25, 2026

Conversation

ulysses4ever commented Apr 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Bodigrim commented Apr 20, 2026

Uh oh!

geekosaur commented Apr 20, 2026

Uh oh!

ulysses4ever commented Apr 21, 2026

Uh oh!

Bodigrim commented Apr 21, 2026

Uh oh!

ulysses4ever commented Apr 21, 2026

Uh oh!

Bodigrim commented Apr 21, 2026

Uh oh!

philderbeast commented Apr 21, 2026

Uh oh!

Bodigrim commented Apr 21, 2026

Uh oh!

ulysses4ever commented Apr 21, 2026

Uh oh!

ulysses4ever commented Apr 23, 2026

Uh oh!

philderbeast commented Apr 23, 2026

Uh oh!

Mikolaj left a comment

Choose a reason for hiding this comment

Uh oh!

mergify Bot commented Apr 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge Queue Status

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

ulysses4ever commented Apr 20, 2026 •

edited

Loading

mergify Bot commented Apr 25, 2026 •

edited

Loading