summaryrefslogtreecommitdiff
diff options
authorPaweł Stołowski <stolowski@gmail.com>2021-10-22 15:55:55 +0200
committerPaweł Stołowski <stolowski@gmail.com>2021-10-25 11:53:11 +0200
commitfbd486e0df68790d1d38e789821517a92678f1b6 (patch)
tree117f2bd30ac9f2feb0070964d1942e1267f46fe7
parent889d36485e049d42a6ae7788b5818989e3c3982d (diff)
Move restore before execute.validation-sets/spread-test-enforcing
-rw-r--r--tests/main/snap-validate-enforce/task.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/main/snap-validate-enforce/task.yaml b/tests/main/snap-validate-enforce/task.yaml
index 5dd39fa57f..f1e4eef2e7 100644
--- a/tests/main/snap-validate-enforce/task.yaml
+++ b/tests/main/snap-validate-enforce/task.yaml
@@ -20,6 +20,10 @@ summary: |
environment:
ACCOUNT_ID: xSfWKGdLoQBoQx88vIM1MpbFNMq53t1f
+restore: |
+ snap validate --forget "$ACCOUNT_ID"/testenforce1 || true
+ snap validate --forget "$ACCOUNT_ID"/testenforce2 || true
+
execute: |
echo "Setting validation set in enforce mode fails when snap is not installed"
if snap validate --enforce "$ACCOUNT_ID"/testenforce1 > log.txt 2>&1; then
@@ -80,7 +84,3 @@ execute: |
snap validate | MATCH "^$ACCOUNT_ID/testenforce1 +enforce +2 +valid"
snap validate | MATCH "^$ACCOUNT_ID/testenforce2 +enforce +1 +valid"
snap list | MATCH "test-snapd-validation-set-enforcing +2\.0\.0 +2 +latest/edge"
-
-restore: |
- snap validate --forget "$ACCOUNT_ID"/testenforce1 || true
- snap validate --forget "$ACCOUNT_ID"/testenforce2 || true