Skip to content

ci: Support running tests in parallel (history revised)#2850

Closed
polarathene wants to merge 5 commits intodocker-mailserver:masterfrom
polarathene:tests/tmp-parallelize
Closed

ci: Support running tests in parallel (history revised)#2850
polarathene wants to merge 5 commits intodocker-mailserver:masterfrom
polarathene:tests/tmp-parallelize

Conversation

@polarathene
Copy link
Copy Markdown
Member

@polarathene polarathene commented Oct 22, 2022 •
edited
Loading

Description

Interactive rebased history of @georglauterbach PR #2822 (with the intent to better preserve the git blame history by staging out the changes a bit more carefully)

  • It has been rebased onto current master, all files have been renamed in the first commit (including the clamav.bats test that was merged since). Modifications to those renamed tests follow in the next commit.
  • Makefile changes likewise squashed into single commit and I think I rebased it correctly given new changes in that file since ci: make tests run in parallel #2822 .

Happy to force-push this over the original PR branch, I've just opted for raising a new PR due to discussions / review feedback there (I am not sure if it'd be more difficult to track after the force-push with heavy history rewriting). I've not applied any changes discussed in #2822 feedback.

Type of change

  • New feature (non-breaking change which adds functionality)
  • Improvement (non-breaking change that does improve existing functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation (README.md or the documentation under docs/)
  • If necessary I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

polarathene and others added 5 commits October 22, 2022 18:58
@polarathene
chore: Rename test files to serial and parallel types
5bd7f3a
@polarathene
chore: Update some tests
b4fc562
@georglauterbach @polarathene
fix: test_helper.bats to support parallel runs
56d11bc
@polarathene
chore: Add two new test files
f909d51
@polarathene
chore: Adjust Makefile and GH Actions test workflow
92693aa 
fix: `Makefile` (history squashed into original commit that this one fixed)

If `./test/bats/bin/bats --timing test/serial.*.bats` failed, Bash would then try the `|| ...` fallback which is not actually desired.

Resolved by using  an `if .. then .. else` statement.
@polarathene
Copy link
Copy Markdown
Member Author

polarathene commented Oct 22, 2022 •
edited
Loading

Actual file modifications (since the review page isn't providing proper diffs for some files) can be found here in the relevant commit.

  • test/parallel.1.default_relay_host.bats
  • test/parallel.2.test_helper.bats (has a follow-up commit by @georglauterbach that I kept separate)
  • test/parallel.3.dovecot_inet_protocol.bats
  • test/parallel.3.helper-functions.bats

Review page is still fine for:

  • The Makefile and Github Actions generic_test.yml files.
  • The actual two new files that were added:
    • test/parallel.2.template.bats
    • test/serial.setup.sh.bats

I have not had time to review the actual changes myself. I'll tackle that tomorrow.

@georglauterbach georglauterbach mentioned this pull request Oct 22, 2022
Closed
10 tasks
@georglauterbach
Copy link
Copy Markdown
Member

georglauterbach commented Oct 22, 2022

Would it be fine if I add some commits on top of this PR? I have some ideas that I wanted to apply to the old PR:)

@polarathene
Copy link
Copy Markdown
Member Author

polarathene commented Oct 22, 2022

Would it be fine if I add some commits on top of this PR? I have some ideas that I wanted to apply to the old PR:)

Yeah should be fine 👍 Feel free to take over this PR and commit away :)

@georglauterbach georglauterbach mentioned this pull request Oct 23, 2022
Merged
7 tasks
@georglauterbach
Copy link
Copy Markdown
Member

georglauterbach commented Oct 23, 2022

@polarathene as I cannot add commits to this PR directly, I opened #2857 which incorporates your changes as well. You can now properly review the changes again and probably close this PR.

@georglauterbach
Copy link
Copy Markdown
Member

georglauterbach commented Oct 25, 2022

Closing this in favor of #2857 :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@georglauterbach georglauterbach Awaiting requested review from georglauterbach

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@polarathene @georglauterbach