Skip to content

tests: Revert "tests: disable second special character case for prompting integration tests" #16931

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

Merged
olivercalder merged 1 commit into from
May 8, 2026
Merged

tests: Revert "tests: disable second special character case for prompting integration tests" #16931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions tests/main/apparmor-prompting-integration-tests/special_characters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,23 @@
"permissions": [ "read" ]
}
}
},
{
"prompt-filter": {
"constraints": {
"path": "${BASE_PATH}/foo\\\\\\*\\\\\\?\\(\\)\\\\\\[\\\\\\]\\\\\\{\\\\\\}\\\\\\\\\\\\\\\\",
"path": "${BASE_PATH}/foo\\\\\\*\\\\\\?\\(\\)\\\\\\[\\\\\\]\\\\\\{\\\\\\}\\\\\\\\",
"requested-permissions": [ "read" ]
}
},
"reply": {
"action": "allow",
"lifespan": "single",
"constraints": {
"path-pattern": "${BASE_PATH}/foo\\*\\?()\\[\\]\\{\\}\\\\",
"permissions": [ "read" ]
}
}
}
]
}
15 changes: 6 additions & 9 deletions tests/main/apparmor-prompting-integration-tests/special_characters.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ echo "$SECOND_CONTENT" | tee "${TEST_DIR}/foo*?()[]{}\\"
echo "Attempt to read the first file"
FIRST_OUTPUT="$(snap run --shell prompt-requester.home -c "cat ${TEST_DIR}/'[アニメ][ゲーム動画].mkv'")"

echo "Skip reading the second file as there's an issue with the prompting-client.scripted parsing the sequence"
# TODO: actually do the second read
#echo "Attempt to read the second file"
#SECOND_OUTPUT="$(snap run --shell prompt-requester.home -c "cat ${TEST_DIR}/'foo*?()[]{}\\'")"
echo "Attempt to read the second file"
SECOND_OUTPUT="$(snap run --shell prompt-requester.home -c "cat ${TEST_DIR}/'foo*?()[]{}\\'")"

# Wait for the client to write its result and exit
for i in $(seq "$TIMEOUT") ; do
Expand All @@ -51,8 +49,7 @@ if [ "$FIRST_OUTPUT" != "$FIRST_CONTENT" ] ; then
exit 1
fi

# TODO: actually check the second output
#if [ "$SECOND_OUTPUT" != "$SECOND_CONTENT" ] ; then
# echo "test script failed"
# exit 1
#fi
if [ "$SECOND_OUTPUT" != "$SECOND_CONTENT" ] ; then
echo "test script failed"
exit 1
fi
Loading