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

Prepare un-flatmapping #469

Merged
merged 3 commits into from
Oct 26, 2022

Conversation

felixfontein
Copy link
Collaborator

@felixfontein felixfontein commented Oct 12, 2022

SUMMARY

Prepares un-flatmapping. When collapsing the tests/unit/plugins/modules directory tree, there are some clashes because there are different fixtures directories in the tree structure. This PR renames these fixtures directories by prepending them with the module group names.

Also removes some string wrapping so that automatic replacements work.

With these changes, https://gist.github.com/felixfontein/3123dcdf446c9e140949a0589cceb99d can remove flatmapping and at least the Python 3.10 unit tests still pass :)

Ref: ansible-community/community-topics#147

ISSUE TYPE
  • Bugfix Pull Request
  • Feature Pull Request
COMPONENT NAME

unit tests

@felixfontein
Copy link
Collaborator Author

Currently contains #470.

@felixfontein felixfontein changed the title [WIP] Prepare un-flatmapping Prepare un-flatmapping Oct 18, 2022
Copy link
Contributor

@Andersson007 Andersson007 left a comment

Choose a reason for hiding this comment

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

Titanic work

Copy link

@russoz russoz left a comment

Choose a reason for hiding this comment

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

LGTM

@felixfontein felixfontein merged commit a1f1593 into ansible-collections:main Oct 26, 2022
@patchback
Copy link

patchback bot commented Oct 26, 2022

Backport to stable-4: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-4/a1f1593ed3a7020d2c1bc9b343f850b8ab4a1c0a/pr-469

Backported as #472

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein felixfontein deleted the prepare-unflatmap branch October 26, 2022 05:32
patchback bot pushed a commit that referenced this pull request Oct 26, 2022
* Add prefix to fixtures directory to avoid name-clashes when removing flatmapping.

* Make sure string replacement works when automatically un-flatmapping.

* Match filenames inside directories.

(cherry picked from commit a1f1593)
@felixfontein
Copy link
Collaborator Author

@Andersson007 @russoz thanks a lot for reviewing this!

felixfontein added a commit that referenced this pull request Oct 26, 2022
* Add prefix to fixtures directory to avoid name-clashes when removing flatmapping.

* Make sure string replacement works when automatically un-flatmapping.

* Match filenames inside directories.

(cherry picked from commit a1f1593)

Co-authored-by: Felix Fontein <felix@fontein.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants