CA-390883: Move usb_reset.py to python3, test mount() in a namespace #5565
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
|
Thanks for opening this, I've changed the base branch to feature/py3 |
psafont
reviewed
Apr 17, 2024
psafont
approved these changes
Apr 17, 2024
bernhardkaindl
requested review from
liulinC and
freddy77
and removed request for
edwintorok
liulinC
reviewed
Apr 19, 2024
| sys.modules.pop(module_name) | ||
|
|
||
|
|
||
| def import_file_as_module(relative_script_path): # type:(str) -> ModuleType |
There was a problem hiding this comment.
this file is duplicated with https://github.com/xapi-project/xen-api/blob/feature/py3/python3/unittest/import_file.py
There was a problem hiding this comment.
Not quite, this one provides more functionality
There was a problem hiding this comment.
I've prepared a branch that deletes import_file.py: feature/py3...psafont:xen-api:test-and-fix-usb_reset-mount
|
currently python3 folder has sub-folders as
|
Use a rootless container (like unshare --map-root-user --mount) to test the correct calling convention for mount()/umount(). Use a context manager test fixture to temporarily mock module imports: This allows to mock global modules only temporary for importing the testee without affecting other tests. - Add a sufficient testcase to test usb_reset.py: mount() and umount() without mocking the system or library calls in any way. - Use python3/tests a Python tests package to allow for non-deprecated relative imports: Absolute imports within a module are deprecated. Signed-off-by: Bernhard Kaindl <bernhard.kaindl@cloud.com>
bernhardkaindl
force-pushed
the
test-and-fix-usb_reset-mount
branch
from
50e7168
to
69338c5
Compare
Bernhard Kaindl: Resolved a conflict with one of my other upcoming changes which removes the need to a pytype ignore by using a cast() instead, which fixes pyright/pylance/vscode. Also keep import_helper in python3/tests as the the name "unittest" sould likely avoided as it clashes with the unittest module. The tests in python3/tests are written for pytest instead and not all of them will classify as unit tests, so using the name unittest for them would also be a misnomer. Using the name tests is shorter and more generic, and we can also use the separation beween tests and unittest to differentiate between modern pytest tests and legact unittest-based tests which should possibly be better migrated to pytest at some point for the benefits that pytest gives: For example with pytest, you can use use just assert and you do not need to use self.assert...(), because pytest implements the proper assert matching diagnostics. In the long run, the classic unittest tests should no longer be used. Co-authored-by: Bernhard Kaindl <bernhard.kaindl@cloud.com> Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
bernhardkaindl
force-pushed
the
test-and-fix-usb_reset-mount
branch
from
69338c5
to
2bf2a44
Compare
liulinC
approved these changes
Apr 25, 2024
There was a problem hiding this comment.
tests and unittest folder can be combined,
I approve this PR for now, @stephenchengCloud Could you please help on this at proper time.
Sure, I'll raise another PR for this. |
pytype_reporter extracted 33 problem reports from pytype output. You can check the results of the job here |
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.
This is the requested follow-up from #5401 (CA-390883: Add unit test for usb_reset.py)
The only changes in this PR compared to #5401 which was closed due to inactivity are:
scripts/usb_reset.pytopython3/libexec/usb_reset.py.github/workflows/main.ymlthat were merged using another PR.#5401 was approved by linliu, and the only remaining request was by @psafont:
Done now.