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.

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

Add further tests of cyclical project imports #9665

Merged
merged 2 commits into from
Jan 29, 2024

Conversation

philderbeast
Copy link
Collaborator

@philderbeast philderbeast commented Jan 27, 2024

While reviewing #9578, I saw that the cyclical test didn't assertOutputContains and had but one cyclical test, a simple loopback of a project importing itself. It now has the following test projects;

+-- cyclical-0-self.project (imports cyclical-0-self.project)
+-- cyclical-0-self.project (already processed)
+-- etc
+-- cyclical-1-out-back.project
 +-- cyclical-1-out-back.config (imports cyclical-1-out-back.project)
+-- cyclical-1-out-back.project (already processed)
 +-- etc
+-- cyclical-1-out-self.project
 +-- cyclical-1-out-self.config (imports cyclical-1-out-self.config)
 +-- cyclical-1-out-self.config (already processed)
 +-- etc
+-- cyclical-2-out-out-backback.project
 +-- cyclical-2-out-out-backback-a.config
  +-- cyclical-2-out-out-backback-b.config (imports cyclical-2-out-out-backback.project)
+-- cyclical-2-out-out-backback.project (already processed)
 +-- etc
+-- cyclical-2-out-out-back.project
+-- cyclical-2-out-out-back-a.config
 +-- cyclical-2-out-out-back-b.config (imports cyclical-2-out-out-back-a.config)
+-- cyclical-2-out-out-back-a.config (already processed)
 +-- etc
+-- cyclical-2-out-out-self.project
 +-- cyclical-2-out-out-self-a.config
  +-- cyclical-2-out-out-self-b.config (imports cyclical-2-out-out-self-b.config)
  +-- cyclical-2-out-out-self-b.config (already processed)
  +-- etc

@philderbeast
Copy link
Collaborator Author

Thanks @geekosaur, I've added newlines where they were missing in all files.

@philderbeast
Copy link
Collaborator Author

philderbeast commented Jan 28, 2024

@Mikolaj if this gets approval, could we waive the 2 day delay please? It expands tests, tests that would help with #9578.

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.

Agreed, let's expedite this PR.

@Mikolaj
Copy link
Member

Mikolaj commented Jan 29, 2024

@philderbeast: please kindly rebase/squash/redo commits as you see fit and please set the labels, including the delay_passed label.

- Assert on exact cyclical import failure message
- Add logging and assertOutputContains to cyclical tests
- Use a different naming convention for cyclical import tests
- Use "self" in naming
- Show import tree
@philderbeast philderbeast force-pushed the test/project-cyclical-import branch from 3dbe09b to 3f92ac6 Compare January 29, 2024 13:23
@philderbeast
Copy link
Collaborator Author

Thanks @Mikolaj. I've squashed down to two commits, one that adds assertOutputContains to make the existing test more robust and another for adding the additional tests.

@philderbeast philderbeast added merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge+no rebase and removed attention: needs-review labels Jan 29, 2024
@mergify mergify bot merged commit e268c0a into haskell:master Jan 29, 2024
49 checks passed
@philderbeast
Copy link
Collaborator Author

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge+no rebase
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants