From: Andrew Halaney <ahalaney@xxxxxxxxxx>
redhat: self-test: Use a more complete SRPM file suffix
QE reported that some of the tests were skipped due to having both
the SRPM and the resulting RPMs built.
While the self-test folder has some expectations on the environment,
let's make it so the check only counts SRPMs and not RPMs.
Reported-by: Stephen Bertram <sbertram@xxxxxxxxxx>
Signed-off-by: Andrew Halaney <ahalaney@xxxxxxxxxx>
diff --git a/redhat/self-test/1002-basic-structural-test.bats b/redhat/self-test/1002-basic-structural-test.bats
index blahblah..blahblah 100644
--- a/redhat/self-test/1002-basic-structural-test.bats
+++ b/redhat/self-test/1002-basic-structural-test.bats
@@ -8,12 +8,12 @@ _SRPM_unpacks_OK() {
}
@test "SRPM unpacks OK" {
- numsrpms=$(find "$BATS_TEST_DIRNAME"/.. -name "*.rpm" | wc -l)
+ numsrpms=$(find "$BATS_TEST_DIRNAME"/.. -name "*.src.rpm" | wc -l)
if [ "$numsrpms" != "1" ]; then
skip "Only one SRPM should be in $BATS_TEST_DIRNAME/redhat/rpms/SRPMS."
fi
- srpm=$(find "$BATS_TEST_DIRNAME"/.. -name "*.rpm")
+ srpm=$(find "$BATS_TEST_DIRNAME"/.. -name "*.src.rpm")
pushd "$BATS_TMPDIR"
if [ -e SRPMS ]; then
rm -fr SRPMS
@@ -26,7 +26,7 @@ _SRPM_unpacks_OK() {
}
@test "Linux tree unpacks OK" {
-numsrpms=$(find "$BATS_TEST_DIRNAME"/.. -name "*.rpm" | wc -l)
+numsrpms=$(find "$BATS_TEST_DIRNAME"/.. -name "*.src.rpm" | wc -l)
if [ "$numsrpms" != "1" ]; then
skip "Only one SRPM should be in $BATS_TEST_DIRNAME/redhat/rpms/SRPMS."
fi
@@ -40,7 +40,7 @@ numsrpms=$(find "$BATS_TEST_DIRNAME"/.. -name "*.rpm" | wc -l)
}
@test "Linux top level structural check" {
- numsrpms=$(find "$BATS_TEST_DIRNAME"/.. -name "*.rpm" | wc -l)
+ numsrpms=$(find "$BATS_TEST_DIRNAME"/.. -name "*.src.rpm" | wc -l)
if [ "$numsrpms" != "1" ]; then
skip "Only one SRPM should be in $BATS_TEST_DIRNAME/redhat/rpms/SRPMS."
fi
diff --git a/redhat/self-test/1003-rpminspect.bats b/redhat/self-test/1003-rpminspect.bats
index blahblah..blahblah 100644
--- a/redhat/self-test/1003-rpminspect.bats
+++ b/redhat/self-test/1003-rpminspect.bats
@@ -10,12 +10,12 @@ load test-lib.bash
skip "Skip rpminspect test pending fixes"
fi
- numsrpms=$(find "$BATS_TEST_DIRNAME"/.. -name "*.rpm" | wc -l)
+ numsrpms=$(find "$BATS_TEST_DIRNAME"/.. -name "*.src.rpm" | wc -l)
if [ "$numsrpms" != "1" ]; then
skip "Only one SRPM should be in $BATS_TEST_DIRNAME/redhat/rpms/SRPMS."
fi
- srpm=$(find "$BATS_TEST_DIRNAME"/.. -name "*.rpm")
+ srpm=$(find "$BATS_TEST_DIRNAME"/.. -name "*.src.rpm")
run rpminspect $srpm
check_status
}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2764
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
