Skip to content

test: use a unique temp dir in test_variable_in_filter #2368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eran132 wants to merge 2 commits into
base: main
Choose a base branch
from
+18 −9
Open

test: use a unique temp dir in test_variable_in_filter #2368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43590c0
test: use a unique temp dir in test_variable_in_filter
eran132 Jun 6, 2026
47338aa
test: clean up via trap and use $(...) in test_variable_in_filter
eran132 Jun 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions tests/API/OVAL/unittests/test_variable_in_filter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,23 @@
set -e
set -o pipefail

result=`mktemp`
stdout=`mktemp`
stderr=`mktemp`
echo "secret_key" > /tmp/key_file
oval_def=$(mktemp)
result=$(mktemp)
stdout=$(mktemp)
stderr=$(mktemp)
temp_dir=$(mktemp -d)

$OSCAP oval eval --results "$result" "$srcdir/test_variable_in_filter.xml" > "$stdout" 2> "$stderr"
cleanup() {
rm -f "$oval_def" "$result" "$stdout" "$stderr"
rm -rf "$temp_dir"
}
trap cleanup EXIT

cp "$srcdir/test_variable_in_filter.xml" "$oval_def"
sed -i "s;TEMP_DIR_PLACEHOLDER;$temp_dir;" "$oval_def"
echo "secret_key" > "$temp_dir/key_file"

$OSCAP oval eval --results "$result" "$oval_def" > "$stdout" 2> "$stderr"
grep "Failed to convert OVAL state to SEXP" "$stderr" && exit 1
assert_exists 1 '//oval_results/results/system/definitions/definition[@result="true"]'
assert_exists 0 '//oval_results/results/system/definitions/definition[@result!="true"]'

rm -f "$result" "$stdout" "$stderr" /tmp/key_file
4 changes: 2 additions & 2 deletions tests/API/OVAL/unittests/test_variable_in_filter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</oval:tests>
<oval:objects>
<ns3:file_object comment="object with a filter" id="oval:x:obj:1" version="1">
<ns3:path>/tmp</ns3:path>
<ns3:path>TEMP_DIR_PLACEHOLDER</ns3:path>
<ns3:filename operation="pattern match">^key_file$</ns3:filename>
<oval:filter action="exclude">oval:x:ste:1</oval:filter>
</ns3:file_object>
Expand All @@ -36,7 +36,7 @@
</oval:objects>
<oval:states>
<ns3:file_state comment="state used in filter, references a variable" id="oval:x:ste:1" version="1">
<ns3:path>/tmp</ns3:path>
<ns3:path>TEMP_DIR_PLACEHOLDER</ns3:path>
<ns3:filename operation="pattern match">^key_file$</ns3:filename>
<ns3:group_id datatype="int" var_ref="oval:x:var:1"/>
<ns3:user_id datatype="int">0</ns3:user_id>
Expand Down