test: pytestify test_main.py #5758
Merged
Conversation
This file contains 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
TheRealFalcon
force-pushed
the
pytestify-main
branch
from
2aba719
to
dbc06fe
Compare
TheRealFalcon
commented
Sep 30, 2024
| # modules are run (including write_files) | ||
| self.assertEqual( | ||
| "blah", load_text_file(os.path.join(self.new_root, "etc/blah.ini")) | ||
| assert "set_hostname" == name |
There was a problem hiding this comment.
I did simplify the logic here and remove a lot of extraneous checks in the rest of the test. The goal of this test was to ensure that set_hostname gets called from main.py, and the rest of the checks that happened here already exist in the previous test.
TheRealFalcon
force-pushed
the
pytestify-main
branch
from
dbc06fe
to
1c03f47
Compare
23 tasks
blackboxsw
reviewed
Oct 1, 2024
tests/unittests/cmd/test_main.py
Outdated
Comment on lines
23
to
27
| # cc_ubuntu_install module calls get_meta_doc on import. | ||
| # This call will fail if filesystem redirection mocks are in place | ||
| # and the module hasn't already been imported which can depend | ||
| # on test ordering. | ||
| mocker.patch("cloudinit.config.schema.get_meta_doc", return_value={}) |
There was a problem hiding this comment.
Now that #5757 landed I think this mock can be dropped right?
Suggested change
| # cc_ubuntu_install module calls get_meta_doc on import. | |
| # This call will fail if filesystem redirection mocks are in place | |
| # and the module hasn't already been imported which can depend | |
| # on test ordering. | |
| mocker.patch("cloudinit.config.schema.get_meta_doc", return_value={}) |
TheRealFalcon
force-pushed
the
pytestify-main
branch
from
1c03f47
to
aad5042
Compare
blackboxsw
approved these changes
Oct 1, 2024
| ) | ||
| mocker.patch("cloudinit.cmd.main.util.get_cmdline", return_value="") | ||
| mocker.patch("cloudinit.cmd.main.util.uptime", return_value="12345") | ||
| os.environ["_CLOUD_INIT_SAVE_STDOUT"] = "true" |
There was a problem hiding this comment.
TIL about avoiding the stdout/err redirect.
| os.environ.pop("_CLOUD_INIT_SAVE_STDOUT") | ||
|
|
||
| @pytest.fixture | ||
| def cloud_cfg(self, mocker, tmpdir, fake_filesystem): |
There was a problem hiding this comment.
I had wondered about using our paths fixture from conftest.py here. But, because of the need to ensure_dir throughout it didn't make sense.
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
Merge type