fix(ug_util): prioritize user-data.users over the default user config#6860
Open
mostafaCamel wants to merge 2 commits intocanonical:mainfrom
Open
fix(ug_util): prioritize user-data.users over the default user config#6860mostafaCamel wants to merge 2 commits intocanonical:mainfrom
mostafaCamel wants to merge 2 commits intocanonical:mainfrom
Conversation
… default user config Signed-off-by: Mostafa Abdelwahab <mostafa.abdelwahab@canonical.com>
Contributor
Author
|
The first commit I pushed is failing as expected as I only added the unit test The expected failure TOTAL 33026 6291 12224 1597 79%
=========================== short test summary info ============================
FAILED tests/unittests/distros/test_user_data_normalize.py::TestUGNormalize::test_users_dict_override_default_attribute - assert True is False
= 1 failed, 5641 passed, 5 skipped, 13 xfailed, 2 xpassed, 84 warnings in 118.45s (0:01:58) =
py3: exit 1 (129.32 seconds) /home/runner/work/cloud-init/cloud-init> .tox/py3/bin/python -m pytest -vv --cov=cloudinit --cov-branch --color=yes pid=2384
py3: FAIL code 1 (135.99=setup[6.67]+cmd[129.32] seconds)
evaluation failed :( (136.04 seconds)
Error: Process completed with exit code 1. |
Signed-off-by: Mostafa Abdelwahab <mostafa.abdelwahab@canonical.com>
Contributor
Author
Contributor
Author
|
After pushing the code fix, all the unit tests now pass |
holmanb
requested changes
May 6, 2026
Member
holmanb
left a comment
There was a problem hiding this comment.
Please add an integration test.
Contributor
Author
|
Note to myself about the integration tests (will work on it the weekend):
|
This file contains hidden or 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
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.
Proposed Commit Message
Additional Context
Test Steps
.tox/py3/bin/python -m pytest -vv tests/unittests/distros/test_user_data_normalize.py::TestUGNormalizeMerge type