-
Notifications
You must be signed in to change notification settings - Fork 1.1k
tests: convert util.pathprefix2dict tests from unittest to pytest #6433
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
Merged
aciba90
merged 4 commits into
canonical:main
from
Aamir017:add-tests-for-pathprefix2dict
Sep 1, 2025
+21
−24
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,40 @@ | ||
| # This file is part of cloud-init. See LICENSE file for license information. | ||
|
|
||
| import shutil | ||
| import tempfile | ||
| import pytest | ||
|
|
||
| from cloudinit import util | ||
| from tests.unittests.helpers import TestCase, populate_dir | ||
| from tests.unittests.helpers import populate_dir | ||
|
|
||
|
|
||
| class TestPathPrefix2Dict(TestCase): | ||
| def setUp(self): | ||
| super(TestPathPrefix2Dict, self).setUp() | ||
| self.tmp = tempfile.mkdtemp() | ||
| self.addCleanup(shutil.rmtree, self.tmp) | ||
|
|
||
| def test_required_only(self): | ||
| class TestPathPrefix2Dict: | ||
| def test_required_only(self, tmp_path): | ||
| dirdata = {"f1": b"f1content", "f2": b"f2content"} | ||
| populate_dir(self.tmp, dirdata) | ||
| populate_dir(str(tmp_path), dirdata) | ||
|
|
||
| ret = util.pathprefix2dict(self.tmp, required=["f1", "f2"]) | ||
| self.assertEqual(dirdata, ret) | ||
| ret = util.pathprefix2dict(str(tmp_path), required=["f1", "f2"]) | ||
| assert dirdata == ret | ||
|
|
||
| def test_required_missing(self): | ||
| def test_required_missing(self, tmp_path): | ||
| dirdata = {"f1": b"f1content"} | ||
| populate_dir(self.tmp, dirdata) | ||
| populate_dir(str(tmp_path), dirdata) | ||
| kwargs = {"required": ["f1", "f2"]} | ||
| self.assertRaises(ValueError, util.pathprefix2dict, self.tmp, **kwargs) | ||
| with pytest.raises(ValueError): | ||
| util.pathprefix2dict(str(tmp_path), **kwargs) | ||
|
|
||
| def test_no_required_and_optional(self): | ||
| def test_no_required_and_optional(self, tmp_path): | ||
| dirdata = {"f1": b"f1c", "f2": b"f2c"} | ||
| populate_dir(self.tmp, dirdata) | ||
| populate_dir(str(tmp_path), dirdata) | ||
|
|
||
| ret = util.pathprefix2dict( | ||
| self.tmp, required=None, optional=["f1", "f2"] | ||
| str(tmp_path), required=None, optional=["f1", "f2"] | ||
| ) | ||
| self.assertEqual(dirdata, ret) | ||
| assert dirdata == ret | ||
|
|
||
| def test_required_and_optional(self): | ||
| def test_required_and_optional(self, tmp_path): | ||
| dirdata = {"f1": b"f1c", "f2": b"f2c"} | ||
| populate_dir(self.tmp, dirdata) | ||
| populate_dir(str(tmp_path), dirdata) | ||
|
|
||
| ret = util.pathprefix2dict(self.tmp, required=["f1"], optional=["f2"]) | ||
| self.assertEqual(dirdata, ret) | ||
| ret = util.pathprefix2dict( | ||
| str(tmp_path), required=["f1"], optional=["f2"] | ||
| ) | ||
| assert dirdata == ret | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we also keep the class grouping?