test: stop using unittest_toolbox in new tests #1792
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
Define TESTS_DIR constant in tests/util.py as full path to the parent directory of the util module. This may be used to reliably read other files in tests dir, such es "repository_data" or "simple_server", regardless of cwd. This commit also replaces a couple of `getcwd() + "filename"` with `TESTS_DIR + filename`, so that in the future (post theupdateframework#1790) we should be able to invoke the tests from anywhere, not only from within the tests directory as is now the case. Signed-off-by: Lukas Puehringer <lukas.puehringer@nyu.edu>
Update new test modules to stop using unittest_toolbox, in preparation for its removal in theupdateframework#1790. The tools provided by unittest_toolbox can easily (in a more obvious way) be replaced by using the standard library modules `tempfile` and `random` (no more used) directly. In the case of tempdir and -file creation/removal, skipping the use of unittest_toolbox, which does this by default, also uncovers some test cleanup failures, which would occur when temporary test directories were removed while a test server hadn't released them. (see `except OSError: pass` in unittest_toolbox's `tearDown` method) **Change details** **test_fetcher_ng.py:** - Stop implicitly creating (setUp) and removing (tearDown) tmp test dirs. -Move now manual creation of an exemplary targets file to setUpClass, as the same file is used by all tests. And remove it explicitly in tearDownClass after killing the server (see note about failure above). - Trigger URL parsing error with a hardcoded invalid URL string instead of a random string. **test_updater_ng.py** - Stop implicitly creating (setUp) and removing (tearDown) tmp test dirs. - Explicitly create tmp test dirs in setUp, but don't remove them in tearDown to avoid above mentioned failures. They will be removed all at once when removing the tmp root test dir in tearDownClass Signed-off-by: Lukas Puehringer <lukas.puehringer@nyu.edu>
Pull Request Test Coverage Report for Build 1739961338
💛 - Coveralls |
Merged
jku
approved these changes
Jan 25, 2022
MVrachev
reviewed
Jan 25, 2022
| cls.file_contents = b"junk data" | ||
| cls.file_length = len(cls.file_contents) | ||
| with tempfile.NamedTemporaryFile( | ||
| dir=os.getcwd(), delete=False |
There was a problem hiding this comment.
Didn't know you can close a tempfile and not delete it, cool.
MVrachev
approved these changes
Jan 25, 2022
lukpueh
added a commit
to lukpueh/tuf
that referenced
this pull request
Jan 25, 2022
re https: --> `https` is handled transparently by `requests` library used in default request fetcher. no need to test in python-tuf re toolbox: theupdateframework#1792 Signed-off-by: Lukas Puehringer <lukas.puehringer@nyu.edu>
lukpueh
added a commit
to lukpueh/tuf
that referenced
this pull request
Jan 26, 2022
Remove tests for legacy client, repository/developer tool and command line tools, which will be removed in subsequent commits. This commits also removes obsolete test tooling: - Regarding simple_https_server + test certificates -- http/https is no longer handled by tuf client directly but transparently by the underlying requests module used by the default fetcher implementation. - For details about unittest_toolbox see theupdateframework#1792 Signed-off-by: Lukas Puehringer <lukas.puehringer@nyu.edu>
MVrachev
pushed a commit
to MVrachev/tuf
that referenced
this pull request
Feb 7, 2022
Remove tests for legacy client, repository/developer tool and command line tools, which will be removed in subsequent commits. This commits also removes obsolete test tooling: - Regarding simple_https_server + test certificates -- http/https is no longer handled by tuf client directly but transparently by the underlying requests module used by the default fetcher implementation. - For details about unittest_toolbox see theupdateframework#1792 Signed-off-by: Lukas Puehringer <lukas.puehringer@nyu.edu>
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.
Fixes parts of #1745
Description of the changes being introduced by the pull request:
Update new test modules to stop using unittest_toolbox in preparation for its removal in #1790.
The tools provided by unittest_toolbox can easily (in a more obvious way) be replaced by using the standard library modules
tempfileandrandom(no more used) directly.In the case of tempdir and -file creation/removal, skipping the use of unittest_toolbox, which creates/removes a tmp dir for each test by default, also uncovers some test cleanup failures, which would occur when temporary test directories were removed while a test server hadn't released them.
(see
except OSError: passin unittest_toolbox's tearDown method)Change details
test_fetcher_ng.py:
test_updater_ng.py
--
unrelated change: define a TESTS_DIR constant for convenience
Please verify and check that the pull request fulfills the following
requirements: