Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add tests for project imports and constraint version conflicts #9680

Merged
merged 3 commits into from
Feb 1, 2024
Merged

Add tests for project imports and constraint version conflicts #9680

merged 3 commits into from
Feb 1, 2024

Conversation

philderbeast
Copy link
Collaborator

While reviewing #9578, I saw opportunity for more project import tests in addition to those added in #9665. This also adds tests of constraint version priority capturing the current behaviour.

I've left comments in cabal-testsuite/PackageTests/ConditionalAndImport/cabal.test.hs where the current behaviour is not good.

geekosaur
geekosaur approved these changes Jan 31, 2024
View reviewed changes
Copy link
Collaborator

@geekosaur geekosaur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have a number of files without final newlines again.

@philderbeast
Copy link
Collaborator Author

Thanks @geekosaur, fixed now.

Mikolaj
Mikolaj approved these changes Feb 1, 2024
View reviewed changes
Copy link
Member

@Mikolaj Mikolaj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent. Particular thanks for the documentation of the tests.

@philderbeast
Add noncyclical tests that hop over folders
78fcdc6 
- Allow for bad behaviour of master branch
- Add cyclical checks with same file names and hops
- Add cyclical import tests with 1 and 2 hops in cycle
- Expected output has project with full project path
- Add newlines at EOF
@philderbeast philderbeast force-pushed the test/project-hop-imports branch from 86d66cb to 78fcdc6 Compare February 1, 2024 11:56
@philderbeast
Copy link
Collaborator Author

Thanks for the approval @Mikolaj. I've squashed the commit that added final newlines with its predecessor. Like #9665, are you happy to waive the 2-day wait?

@philderbeast
Copy link
Collaborator Author

Label merge+no rebase is necessary when the pull request is from an organisation.

@Mikolaj
Copy link
Member

Mikolaj commented Feb 1, 2024

Thanks for the approval @Mikolaj. I've squashed the commit that added final newlines with its predecessor. Like #9665, are you happy to waive the 2-day wait?

Yes, I think it makes sense in this case.

@Mikolaj Mikolaj added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Feb 1, 2024
@mergify mergify bot merged commit 663e98f into haskell:master Feb 1, 2024
37 of 38 checks passed
@philderbeast philderbeast mentioned this pull request Feb 1, 2024
Merged
5 tasks
@Mikolaj
Copy link
Member

Mikolaj commented Feb 1, 2024

Ooops, I forgot to rebase, didn't I?

@philderbeast
Copy link
Collaborator Author

I rebased today didn't I?

@Mikolaj
Copy link
Member

Mikolaj commented Feb 2, 2024

Apparently somebody merged between then and our merge, but the git history complication is marginal this time.

@mergify mergify bot mentioned this pull request Apr 9, 2024
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@geekosaur geekosaur geekosaur approved these changes

@Mikolaj Mikolaj Mikolaj approved these changes

Assignees
No one assigned
Labels
Cabal: tests/package-tests merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge+no rebase
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@philderbeast @Mikolaj @geekosaur