tests: fixes/updates for package-management spread tests

canonical · Mar 11, 2020 · 7204213 · 7204213
1 parent e168876
commit 7204213
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/tests/spread/general/package-management-test-ppa-invalid-key-block/task.yaml b/tests/spread/general/package-management-test-ppa-invalid-key-block/task.yaml
@@ -29,4 +29,4 @@ execute: |
     echo "snapcraft should have exited with error: $output"
     exit 1
   fi
-  echo "$output" | MATCH "The following signatures couldn't be verified"
+  echo "$output" | MATCH "Error adding repository key"
diff --git a/...ith-invalid-key-block/snap/snapcraft.yaml → ...ppa-invalid-key-block/snap/snapcraft.yaml b/...ith-invalid-key-block/snap/snapcraft.yaml → ...ppa-invalid-key-block/snap/snapcraft.yaml
@@ -1,4 +1,4 @@
-name: test-ppa-with-invalid-key-block
+name: test-ppa-invalid-key-block
 version: 'test1'
 summary: test
 description: test

diff --git a/tests/spread/general/package-management-test-ppa-invalid-key-id/task.yaml b/tests/spread/general/package-management-test-ppa-invalid-key-id/task.yaml
@@ -29,4 +29,4 @@ execute: |
     echo "snapcraft should have exited with error: $output"
     exit 1
   fi
-  echo "$output" | MATCH "The following signatures couldn't be verified"
+  echo "$output" | MATCH "Error adding repository key"
diff --git a/tests/spread/general/package-management-test-ppa-invalid-key-server/task.yaml b/tests/spread/general/package-management-test-ppa-invalid-key-server/task.yaml
@@ -29,4 +29,4 @@ execute: |
     echo "snapcraft should have exited with error: $output"
     exit 1
   fi
-  echo "$output" | MATCH "The following signatures couldn't be verified"
+  echo "$output" | MATCH "Error adding repository key"
diff --git a/tests/spread/general/package-management-test-ppa-with-key-block/task.yaml b/tests/spread/general/package-management-test-ppa-with-key-block/task.yaml
@@ -1,7 +1,7 @@
 summary: Verify encoded repository GPG key.
 
 environment:
-  SNAP_DIR: test-ppa-with-key-blob
+  SNAP_DIR: test-ppa-with-key-block
 
 prepare: |
   #shellcheck source=tests/spread/tools/snapcraft-yaml.sh
@@ -26,7 +26,7 @@ restore: |
 execute: |
   cd "$SNAP_DIR"
   snapcraft
-  snap install test-ppa-with-key-blob*.snap --dangerous
+  snap install test-ppa-with-key-block*.snap --dangerous
 
   # Run test-ppa.
-  test-ppa-with-key-blob.test-ppa | MATCH "hello!"
+  test-ppa-with-key-block.test-ppa | MATCH "hello!"