Add an optional snap.validation-sets/spread-test

3 files changed, 25 insertions, 10 deletions

diff --git a/tests/main/snap-validate-basic/task.yaml b/tests/main/snap-validate-basic/task.yaml
index 146fb45939..5fc0a9d933 100644
--- a/tests/main/snap-validate-basic/task.yaml
+++ b/tests/main/snap-validate-basic/task.yaml
@@ -54,6 +54,12 @@ execute: |
 snap install hello-world
 snap validate | MATCH "$ACCOUNT_ID/bar=1 +monitor +1 +valid"
 snap validate "$ACCOUNT_ID"/bar=1 | MATCH "^valid"
+
+ # presence of bare snap is optional (validation set was valid
+ # already and optional snap doesn't change that).
+ snap install bare
+ snap validate "$ACCOUNT_ID"/bar=1 | MATCH "^valid"
+
 # presence of test-snapd-base-bare is invalid
 snap install test-snapd-base-bare
 snap validate "$ACCOUNT_ID"/bar=1 | MATCH "^invalid"
diff --git a/tests/main/snap-validate-basic/vs1.assert b/tests/main/snap-validate-basic/vs1.assert
index 8faf96582b..6b19d5531d 100644
--- a/tests/main/snap-validate-basic/vs1.assert
+++ b/tests/main/snap-validate-basic/vs1.assert
@@ -14,16 +14,20 @@ snaps:
 id: oXC9AkhtCxhlY80KZA3peZzWbnO4xPOT
 name: test-snapd-base-bare
 presence: invalid
+ -
+ id: EISPgh06mRh1vordZY9OZ34QHdd7OrdR
+ name: bare
+ presence: optional
 timestamp: 2021-03-01T14:54:33+00:00
 sign-key-sha3-384: o_x83A3wpIvJznIHBJIK7jRmRZKLlqx5jOr30HUsloFfBseXNF0ztoj18EvNualy
 
-AcLBcwQAAQoAHRYhBGcBaW1fnjUC+m/JXAL0Fq945gvBBQJgWL+kAAoJEAL0Fq945gvB0kUP/j2F
-NsydmKAn3n94t6G6J9krAqksou5mGloxoTvezSCZmTLoaz8QXOqjUlOL7+ebPZJzT2CMc9qdNlLg
-8xSGW5jb20IPC+J2tlgABhXl5rTqbIjO6J7UyBWM0Sn9PlyiYcwdHAPsHt41XPkXlEi8jjjNYUz/
-OnWRkcrb7zokaoW4ojDS74GBC4bhFfOA56J7TYry8H3YdE0rCdQOt9EyLQRYdpRPfYG0MlHV3C9S
-ZWFH53wnYoVPCf2tTFMYLs9yiO/zVH38nAGhsw4Vc8kaNAfWbiBoknibWxMWO3dF25o7ZNrOm6qn
-3RrGi/Eg3LFUzURjhWcjRMZjY9SM9Z/Ebq20elB0zMOnIdQfYCrG/4CQcS3d1vyY6NPLGf6A3AUd
-+mvgzRYaQJN/p0b3Pbe23pK/vYykb66oXxpe8Xp1g4iMqu2EYzNtWiSkCniRmkfHQ2crE/PLn+u4
-Mic333Vy55b8wooXHgq952KgdTxpPWxKEYBtW1tIoGi5ix7uYnVOQ044RVEeK315Gq4Qni+gq/S3
-ogLFqKqhdyv8i4iMIxry4Yek3/YPNVFlU/IybO9NxiaBi5pf3HGf993+Kjwm5e599K14Tcc5PwxH
-m7y4XApaCb/FATqpKLwRcl1XcajPJ1PpF3K1+3r9h4UM0h+PuVNNUSQ2JaKnsqIs0bTXjq35
+AcLBcwQAAQoAHRYhBGcBaW1fnjUC+m/JXAL0Fq945gvBBQJgW14BAAoJEAL0Fq945gvBblIP/03h
+s3tEosDILwPaMq4pRA2iVyBaktn+aG26khOGtCygPdFQxTW3p0s2kxgkH8GnC6n9iy3B4KZ4EDh6
+qPC2BAY6XEWpp7h8nTMKyrQ7qC08er6qGzSvcS4IvFd+qwp7IqIij0MSvXoy4JSyJqRXh5iWgfMh
+l5YzIunvPG5no3y+v6DlFQILU7yl4G3fblNhKTalC6w378jCusb8jEgxSX7LaelgIKWd1VGpIgAW
+DuRQB5s6np8KhFdJH5ij3I9FAAtRXDtVrjWRQe1pLmxfnA6LaNjUHqGlNysOTi5i2AQrikWPCAM6
+GwrZADkohxMoUm3pNHWqnerunKzflmVvjFnQr10lRMsxfJd6vMm8rb3fA27CqFzRBjbZjcwC5ZsQ
+xV5qo4QpPaPPOV9H/UvmpXWnNrO10HS4c8Z94VwcJnISjJ0I+6xYbRr5JU2zqXwbcL8sSdRIpTaV
+GEM++Oyg17Mj2ZMM5/FnpX3qKbIDgpJPJueITNQhHhKsW1Q81ajopaPiwYL6p2rQDmV+cssaXkDM
+joiBgT8DIb1cpl9aF1/13hyMqaQ+UBtlaNpJATTOsc7loLyaiPOpxYsnRidmRFT8GxLU/yOh3smh
+0bNQKUXx443sVaHUbElpvua2QJVzNB5a0ZKFFXnawQvReHnonFoY+jTqTufa+hA+OiZQyM9u
diff --git a/tests/main/snap-validate-basic/vs1.json b/tests/main/snap-validate-basic/vs1.json
index 9a88e490a3..723c5fb606 100644
--- a/tests/main/snap-validate-basic/vs1.json
+++ b/tests/main/snap-validate-basic/vs1.json
@@ -16,5 +16,10 @@
 "id": "oXC9AkhtCxhlY80KZA3peZzWbnO4xPOT",
 "name": "test-snapd-base-bare",
 "presence": "invalid"
+ },
+ {
+ "id": "EISPgh06mRh1vordZY9OZ34QHdd7OrdR",
+ "name": "bare",
+ "presence": "optional"
 }]
 }