tests: make all prompting integration test variants use prompt-requester

Signed-off-by: Oliver Calder <oliver.calder@canonical.com>

Author: olivercalder

tests/lib/snaps/prompt-requester/meta/snap.yaml

@@ -7,6 +7,10 @@ apps:
     plugs:
       - home
       - camera
+  home:
+    command: bin/cat
+    plugs:
+      - home
   wait-for:
     command: bin/wait-for
     plugs:

tests/main/apparmor-prompting-integration-tests/create_multiple_actioned_by_other_pid_always_allow.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "prompt-filter": {
-    "snap": "prompting-client",
+    "snap": "prompt-requester",
     "interface": "home",
     "constraints": {
       "path": "$BASE_PATH/.*"

tests/main/apparmor-prompting-integration-tests/create_multiple_actioned_by_other_pid_always_allow.sh

@@ -16,14 +16,14 @@ if [ -z "$TIMEOUT" ] ; then
 	TIMEOUT=10
 fi
 
-WRITABLE="$(snap run --shell prompting-client.scripted -c 'cd ~; pwd')/$(basename "$TEST_DIR")"
-snap run --shell prompting-client.scripted -c "mkdir -p $WRITABLE"
+WRITABLE="$(snap run --shell prompt-requester.home -c 'cd ~; pwd')/$(basename "$TEST_DIR")"
+snap run --shell prompt-requester.home -c "mkdir -p $WRITABLE"
 
 for dir in test1 test2 test3 ; do
 	mkdir -p "${TEST_DIR}/${dir}"
 	name="${dir}/file.txt"
 	echo "Attempt to create $name in the background"
-	snap run --shell prompting-client.scripted -c "touch ${WRITABLE}/${dir}-started; echo $name is written > ${TEST_DIR}/${name}; touch ${WRITABLE}/${dir}-finished" &
+	snap run --shell prompt-requester.home -c "touch ${WRITABLE}/${dir}-started; echo $name is written > ${TEST_DIR}/${name}; touch ${WRITABLE}/${dir}-finished" &
 	if ! timeout --verbose "$TIMEOUT" sh -c "while ! [ -f '${WRITABLE}/${dir}-started' ] ; do sleep 0.1 ; done" ; then
 		echo "failed to start create of $name within timeout period"
 		exit 1
@@ -41,7 +41,7 @@ done
 
 echo "Attempt to create test4/file.txt (for which client will reply)"
 mkdir -p "${TEST_DIR}/test4"
-snap run --shell prompting-client.scripted -c "echo test4/file.txt is written > ${TEST_DIR}/test4/file.txt"
+snap run --shell prompt-requester.home -c "echo test4/file.txt is written > ${TEST_DIR}/test4/file.txt"
 
 # Wait for the client to write its result and exit
 for i in $(seq "$TIMEOUT") ; do

tests/main/apparmor-prompting-integration-tests/create_multiple_actioned_by_other_pid_always_deny.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "prompt-filter": {
-    "snap": "prompting-client",
+    "snap": "prompt-requester",
     "interface": "home",
     "constraints": {
       "path": "$BASE_PATH/.*"

tests/main/apparmor-prompting-integration-tests/create_multiple_actioned_by_other_pid_always_deny.sh

@@ -16,14 +16,14 @@ if [ -z "$TIMEOUT" ] ; then
 	TIMEOUT=10
 fi
 
-WRITABLE="$(snap run --shell prompting-client.scripted -c 'cd ~; pwd')/$(basename "$TEST_DIR")"
-snap run --shell prompting-client.scripted -c "mkdir -p $WRITABLE"
+WRITABLE="$(snap run --shell prompt-requester.home -c 'cd ~; pwd')/$(basename "$TEST_DIR")"
+snap run --shell prompt-requester.home -c "mkdir -p $WRITABLE"
 
 for dir in test1 test2 test3 ; do
 	mkdir -p "${TEST_DIR}/${dir}"
 	name="${dir}/file.txt"
 	echo "Attempt to create $name in the background"
-	snap run --shell prompting-client.scripted -c "touch ${WRITABLE}/${dir}-started; echo $name is written > ${TEST_DIR}/${name}; touch ${WRITABLE}/${dir}-finished" &
+	snap run --shell prompt-requester.home -c "touch ${WRITABLE}/${dir}-started; echo $name is written > ${TEST_DIR}/${name}; touch ${WRITABLE}/${dir}-finished" &
 	if ! timeout --verbose "$TIMEOUT" sh -c "while ! [ -f '${WRITABLE}/${dir}-started' ] ; do sleep 0.1 ; done" ; then
 		echo "failed to start create of $name within timeout period"
 		exit 1
@@ -41,7 +41,7 @@ done
 
 echo "Attempt to create test4/file.txt (for which client will reply)"
 mkdir -p "${TEST_DIR}/test4"
-snap run --shell prompting-client.scripted -c "echo test4/file.txt is written > ${TEST_DIR}/test4/file.txt" || true
+snap run --shell prompt-requester.home -c "echo test4/file.txt is written > ${TEST_DIR}/test4/file.txt" || true
 
 # Wait for the client to write its result and exit
 for i in $(seq "$TIMEOUT") ; do

tests/main/apparmor-prompting-integration-tests/create_multiple_allow.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "prompt-filter": {
-    "snap": "prompting-client",
+    "snap": "prompt-requester",
     "interface": "home",
     "constraints": {
       "path": "$BASE_PATH/.*"

tests/main/apparmor-prompting-integration-tests/create_multiple_allow.sh

@@ -11,7 +11,7 @@ fi
 
 for name in test1.txt test2.md fail.txt test3.pdf ; do
 	echo "Attempt to write $name"
-	snap run --shell prompting-client.scripted -c "echo $name is written > ${TEST_DIR}/${name}" || true
+	snap run --shell prompt-requester.home -c "echo $name is written > ${TEST_DIR}/${name}" || true
 done
 
 # Wait for the client to write its result and exit

tests/main/apparmor-prompting-integration-tests/create_multiple_deny-temporal.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "prompt-filter": {
-    "snap": "prompting-client",
+    "snap": "prompt-requester",
     "interface": "home",
     "constraints": {
       "path": "$BASE_PATH/.*"

tests/main/apparmor-prompting-integration-tests/create_multiple_deny.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "prompt-filter": {
-    "snap": "prompting-client",
+    "snap": "prompt-requester",
     "interface": "home",
     "constraints": {
       "path": "$BASE_PATH/.*"

tests/main/apparmor-prompting-integration-tests/create_multiple_deny.sh

@@ -11,7 +11,7 @@ fi
 
 for name in test1.txt test2.md succeed.txt test3.pdf ; do
 	echo "Attempt to write $name"
-	snap run --shell prompting-client.scripted -c "echo $name is written > ${TEST_DIR}/${name}" || true
+	snap run --shell prompt-requester.home -c "echo $name is written > ${TEST_DIR}/${name}" || true
 done
 
 # Wait for the client to write its result and exit