testsuite: Refactor withShorterPathForNewBuildStore #9505
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mpickering
force-pushed
the
wip/refactor-testsuite
branch
2 times, most recently
from
8ff6d70 to
fb56227
Compare
|
Can someone review this please? |
ffaf1
approved these changes
Dec 21, 2023
|
@mpickering: ready for the label! |
mpickering
added
merge me
|
This needs rebasing as some tests are updated to use the old API. |
mpickering
force-pushed
the
wip/refactor-testsuite
branch
from
fb56227 to
f78b707
Compare
alt-romes
force-pushed
the
wip/refactor-testsuite
branch
from
f78b707 to
c906452
Compare
|
I've rebased this commit (basically cherry-picked from the private dependencies branch where it was already updated) |
alt-romes
force-pushed
the
wip/refactor-testsuite
branch
3 times, most recently
from
0e6593c to
ebbd10f
Compare
alt-romes
force-pushed
the
wip/refactor-testsuite
branch
3 times, most recently
from
0932a33 to
555e791
Compare
|
@alt-romes: I'm afraid you've lost the race with mergify (and possibly other PR authors). Could you resolve the conflicts one last time and I'd try to prod mergify until it yields? |
This makes `withShorterPathForNewBuildStore` fit more nicely into the rest of the testing infrastructure. * Move `withShorterPathForNewBuildStore` to `TestM` monad * Move responsibility for passing `--store-dir` to `cabalGArgs` function * Move `findDependencyInStore` into `TestM`, and remove requirement to pass path to store directory. * Introduce `testStoreDir` function which returns the store location (and honours `withShorterPathForNewBuildStore`) * Migrate tests which use `withShorterPathForNewBuildStore`.
alt-romes
force-pushed
the
wip/refactor-testsuite
branch
from
555e791 to
2a2d0b3
Compare
|
@alt-romes: thanks a lot! The merge label is already there and since the PR has been blocked on a merge conflict for so long, I think we can manually set |
Mikolaj
added
the
merge delay passed
|
@mergify regresh |
❌ Sorry but I didn't understand the command. Please consult the commands documentation 📚. |
|
@mergify refresh |
✅ Pull request refreshed |
|
@mergify queue |
🛑 This
|
|
Mergify got confused. It seems to think that -mergify-configuration-changed and that there's not enough reviews. I may end up merging manually. |
|
@mergify unqueue |
✅ The pull request is not waiting to be queued anymore. |
|
@mergify queue |
🛑 The pull request has been merged manuallyThe pull request has been merged manually at 774ff04 |
|
@mergify rebase |
☑️ Nothing to do
|
|
@mergify backport 3.12 |
✅ Backports have been created
|
mergify bot
added a commit
that referenced
this pull request
May 30, 2024
…10059) * testsuite: Refactor withShorterPathForNewBuildStore This makes `withShorterPathForNewBuildStore` fit more nicely into the rest of the testing infrastructure. * Move `withShorterPathForNewBuildStore` to `TestM` monad * Move responsibility for passing `--store-dir` to `cabalGArgs` function * Move `findDependencyInStore` into `TestM`, and remove requirement to pass path to store directory. * Introduce `testStoreDir` function which returns the store location (and honours `withShorterPathForNewBuildStore`) * Migrate tests which use `withShorterPathForNewBuildStore`. (cherry picked from commit 2a2d0b3) # Conflicts: # Cabal-tests/Cabal-tests.cabal # Cabal-tests/lib/Test/Utils/TempTestDir.hs * !fixup resolve conflicts * fixup! always import `(</>)` --------- Co-authored-by: Matthew Pickering <[email protected]> Co-authored-by: Artem Pelenitsyn <[email protected]> Co-authored-by: brandon s allbery kf8nh <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This makes
withShorterPathForNewBuildStorefit more nicely into the rest of the testing infrastructure.withShorterPathForNewBuildStoretoTestMmonad--store-dirtocabalGArgsfunctionfindDependencyInStoreintoTestM, and remove requirement to pass path to store directory.testStoreDirfunction which returns the store location (and honourswithShorterPathForNewBuildStore)withShorterPathForNewBuildStore.Please read Github PR Conventions and then fill in one of these two templates.