Add new test to ensure that CCEs are removed from the avail file #11590
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
This test ensures that any assigned CCE isn't in the respective avail file.
Mab879
force-pushed
the
add_cce_avail_test
branch
from
6d3611d
to
3bb2ffd
Compare
|
Start a new ephemeral environment with changes proposed in this pull request: Fedora Environment Oracle Linux 8 Environment |
jan-cerny
reviewed
Feb 15, 2024
tests/cces-removed.py
Outdated
| @@ -0,0 +1,72 @@ | |||
| #! /usr/bin/python3 | |||
There was a problem hiding this comment.
Suggested change
| #! /usr/bin/python3 | |
| #!/usr/bin/python3 |
tests/cces-removed.py
Outdated
| "run.") | ||
| parser.add_argument('-p', '--products', required=True, | ||
| help='Comma separated list (no spaces) of products to check') | ||
| parser.add_argument('-l', '--cee-list', type=str, required=True, |
There was a problem hiding this comment.
Suggested change
| parser.add_argument('-l', '--cee-list', type=str, required=True, | |
| parser.add_argument('-l', '--cce-list', type=str, required=True, |
tests/CMakeLists.txt
Outdated
| if(PYTHON_VERSION_MAJOR GREATER 2) | ||
| add_test( | ||
| NAME "cce_avail_check-${TEST_NAME_SUFFIX}" | ||
| COMMAND env "PYTHONPATH=$ENV{PYTHONPATH}" "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/cces-removed.py" --root "${CMAKE_SOURCE_DIR}" --json "${CMAKE_SOURCE_DIR}/build/rule_dirs.json" --products "${PRODUCTS}" --cee-list "${CCE_LIST_PATH}" |
There was a problem hiding this comment.
Suggested change
| COMMAND env "PYTHONPATH=$ENV{PYTHONPATH}" "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/cces-removed.py" --root "${CMAKE_SOURCE_DIR}" --json "${CMAKE_SOURCE_DIR}/build/rule_dirs.json" --products "${PRODUCTS}" --cee-list "${CCE_LIST_PATH}" | |
| COMMAND env "PYTHONPATH=$ENV{PYTHONPATH}" "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/cces-removed.py" --root "${CMAKE_SOURCE_DIR}" --json "${CMAKE_SOURCE_DIR}/build/rule_dirs.json" --products "${PRODUCTS}" --cce-list "${CCE_LIST_PATH}" |
tests/CMakeLists.txt
Outdated
|
|
||
| cce_avail_check("rhel-all" "rhel7,rhel8,rhel9" "${CMAKE_SOURCE_DIR}/shared/references/cce-redhat-avail.txt") | ||
| cce_avail_check("sle12" "sle12" "${CMAKE_SOURCE_DIR}/shared/references/cce-sle12-avail.txt") | ||
| cce_avail_check("sle15" "sle15" "${CMAKE_SOURCE_DIR}/shared/references/cce-sle12-avail.txt") |
There was a problem hiding this comment.
Suggested change
| cce_avail_check("sle15" "sle15" "${CMAKE_SOURCE_DIR}/shared/references/cce-sle12-avail.txt") | |
| cce_avail_check("sle15" "sle15" "${CMAKE_SOURCE_DIR}/shared/references/cce-sle15-avail.txt") |
Mab879
added a commit
to Mab879/content
that referenced
this pull request
Feb 15, 2024
Mab879
added a commit
to Mab879/content
that referenced
this pull request
Feb 15, 2024
Mab879
force-pushed
the
add_cce_avail_test
branch
from
45cb7a5
to
775f4f7
Compare
|
/packit retest-failed |
jan-cerny
requested changes
Feb 16, 2024
tests/cces-removed.py
Outdated
| not_removed = avail_cces.intersection(cces_in_use) | ||
| if len(not_removed) != 0: | ||
| for cce in not_removed: | ||
| print(f"CCE {cce} not removed from {args.cee_list}.", file=sys.stderr) |
There was a problem hiding this comment.
here is one more place with the typo
Mab879
force-pushed
the
add_cce_avail_test
branch
from
775f4f7
to
dc85741
Compare
|
Code Climate has analyzed commit dc85741 and detected 0 issues on this pull request. The test coverage on the diff in this pull request is 100.0% (50% is the threshold). This pull request will bring the total coverage in the repository to 58.3% (0.0% change). View more on Code Climate. |
|
/packit retest-failed |
jan-cerny
approved these changes
Feb 16, 2024
|
/packit retest-failed |
1 similar comment
|
/packit retest-failed |
benruland
pushed a commit
to sig-bsi-grundschutz/content
that referenced
this pull request
Mar 6, 2024
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.
Description:
This test ensures that any assigned CCE isn't in the respective avail file.
Rationale:
Help reviewers catch errors.