Skip to content

Commit 2dbadd2

Browse files
tmt: Change var name to be less confusing
We had `works_for_composefs` as a field of the struct to signify whether a test works for composefs or not. We then changed the actual yaml counterpart to be `fixme_skip_if_composefs` but the var name remained as is which is a bit confusing. Also, remove some debug code in tests Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
1 parent e08f7f1 commit 2dbadd2

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

crates/xtask/src/tmt.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -908,8 +908,8 @@ struct TestDef {
908908
test_command: String,
909909
/// Whether this test wants to try bind storage (if distro supports it)
910910
try_bind_storage: bool,
911-
/// Whether this test will work for composefs backend
912-
works_for_composefs: bool,
911+
/// Whether to skip this test for composefs backend
912+
skip_if_composefs: bool,
913913
/// TMT fmf attributes to pass through (summary, duration, adjust, etc.)
914914
tmt: serde_yaml::Value,
915915
}
@@ -1000,7 +1000,7 @@ pub(crate) fn update_integration() -> Result<()> {
10001000
.and_then(|v| v.as_bool())
10011001
.unwrap_or(false);
10021002

1003-
let works_for_composefs = metadata
1003+
let skip_if_composefs = metadata
10041004
.extra
10051005
.as_mapping()
10061006
.and_then(|m| {
@@ -1016,7 +1016,7 @@ pub(crate) fn update_integration() -> Result<()> {
10161016
name: display_name,
10171017
test_command,
10181018
try_bind_storage,
1019-
works_for_composefs,
1019+
skip_if_composefs,
10201020
tmt: metadata.tmt,
10211021
});
10221022
}
@@ -1135,7 +1135,7 @@ pub(crate) fn update_integration() -> Result<()> {
11351135
);
11361136
}
11371137

1138-
if test.works_for_composefs {
1138+
if test.skip_if_composefs {
11391139
plan_value.insert(
11401140
serde_yaml::Value::String(format!("extra-{}", FIELD_FIXME_SKIP_IF_COMPOSEFS)),
11411141
serde_yaml::Value::Bool(true),

tmt/tests/booted/test-install-to-filesystem-var-mount.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@ if [[ $is_composefs != "null" ]]; then
125125
tune2fs -O verity /dev/BL/root02
126126
fi
127127

128-
echo "${COMPOSEFS_BACKEND[@]}"
129-
130128
# Run bootc install to-filesystem from within the container image under test
131129
podman run \
132130
--rm --privileged \

0 commit comments

Comments
 (0)