Fix SRPM collection #63
Closed
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
Instead of calling tar in a subprocess, extract the member using
Python's tarfile library.
This vastly simplifies mocking, so unit tests no longer have to
patch("source_build.extract_blob_member"). This way, the extraction
actually happens and the tests are a bit less disconnected from the
actual behavior.
Signed-off-by: Adam Cmiel <[email protected]>
Previously, the sib_dirs.rpms_dir would only get initialized in
prepare_base_image_sources.
While processing prefetched SRPMs, if base image sources were not
processed, the rpms_dir would still be unset. The SRPMs would get copied
into os.path.join("", ...) (so somewhere in the current directory) and
the script would ignore all of them, because the condition for including
the rpms_dir is that sib_dirs.rpms_dir must be set.
Fix by always initializing rpms_dir at the beginning and changing the
condition from "rpms_dir must be set" to "rpms_dir must not be empty".
Signed-off-by: Adam Cmiel <[email protected]>
Instead of creating the cachi2 directory in setUpClass and cleaning it up in tearDownClass, do this for each test case (in setUp and tearDown). That way, the custom try-finally code for cleanup is no longer needed. Signed-off-by: Adam Cmiel <[email protected]>
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.
Previously, the sib_dirs.rpms_dir would only get initialized in
prepare_base_image_sources.
While processing prefetched SRPMs, if base image sources were not
processed, the rpms_dir would still be unset. The SRPMs would get copied
into os.path.join("", ...) (so somewhere in the current directory) and
the script would ignore all of them, because the condition for including
the rpms_dir is that sib_dirs.rpms_dir must be set.
Fix by always initializing rpms_dir at the beginning and changing the
condition from "rpms_dir must be set" to "rpms_dir must not be empty".