Merge ~kzapalowicz/snappy-hwe-snaps/+git/engineering-tests:fix/udisks2-inform-known-bug into ~snappy-hwe-team/snappy-hwe-snaps/+git/engineering-tests:master

[Konrad Zapałowicz]

Improve udisks2 tests

- Inform about known bug of snapd which affects automount test
- Add tests case to verify that the automount feature does not
  mount system devices

Improve udisks2 tests

- Inform about known bug of snapd which affects automount test
- Add tests case to verify that the automount feature does not
  mount system devices

[Scott Sweeny (ssweeny)]

A couple of spelling/grammar fixes.

review: Needs Fixing

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:ccb8060994679143bda14f39f311673a5e6d41ea
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/994/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/902/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/994/rebuild

review: Needs Fixing (continuous-integration)

[Scott Sweeny (ssweeny)]

Actually come to think of it we should probably link to the bug here so the poor sap who has to run this later can check if it's been fixed.

review: Needs Fixing

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:f6f55f36229392bfa758fc5af1eb10decf52b361
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/995/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/903/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/995/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:1a6659e225b1bed6c200324f1e0d688bc003a837
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/996/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/904/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/996/rebuild

review: Needs Fixing (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

@Scott, sadly I do not have the bug id and I'm not sure it even exists. It is probably on virtual wishlist.

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:1a6659e225b1bed6c200324f1e0d688bc003a837
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1033/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/34
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/722
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/940/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/721

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1033/rebuild

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

A few typos to fix.

review: Needs Fixing

[Jim Hodapp (jhodapp)]

A couple more minor changes needed.

review: Needs Fixing

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:60142fbc5aef59a62d5c2ec371ed213aa95d593b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1111/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/114
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1019/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/817

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1111/rebuild

review: Approve (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:776c6ab69071d7a42a5beeb663cff16cd002e4f6
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1112/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/115
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1020/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/818

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1112/rebuild

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

LGTM

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:a66dd1c7cdbc7cd43e9db9d8c32982299dcc92fc
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1116/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/119
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1024/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/822

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1116/rebuild

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/udisks2/units/udisks2.pxu b/udisks2/units/udisks2.pxu
index a889427..b3079e8 100644
--- a/udisks2/units/udisks2.pxu
+++ b/udisks2/units/udisks2.pxu
@@ -131,6 +131,13 @@ _steps:
      $ sudo snap get udisks2 automount.enable
 _verification:
   Verify that the returned value is "false"
+  .
+  Note that there is a known bug in snapd which preserves the state of the
+  config options between snap remove and snap install. Therefore, if you have
+  ever set the automount option to 'true' before, then it will not be 'false'
+  even if you install the snap fresh. You need to use a fresh image for
+  testing.
+  bug url: https://bugs.launchpad.net/snapd/+bug/1636934
 
 id: udisks2/automount/disabling_works
 category_id: udisks2
@@ -164,3 +171,38 @@ _steps:
 _verification:
   Verify that the filesystem on the USB device was mounted to
   /media/root/<filesystem label>, for example /media/root/7C69-3855
+
+id: udisks2/automount/automount_does_not_mount_system_devices
+category_id: udisks2
+plugin: manual
+depends: udisks2/automount/automount_works
+_summary: When enabled, automount does not mount system devices
+_purpose:
+  Makes sure that automount is only restricted to pluggable devices, not system
+_steps:
+  1. Make sure that automount is enabled. Run:
+     .
+     $ sudo snap set udisks2 automount.enable=true
+  3. Reboot the device and wait for it to power on again
+  4. Run the following:
+     .
+     $ sudo udisks2.udisksctl status
+     .
+     and check the names under the "DEVICE" column. It should just contain
+     thumb drives [if any is plugged-in] and the filesystem. For example,
+     in case of RaspberryPi it would contain just: mmcblk0.
+     Make sure that system devices, such as an ESP partition, are
+     not displayed here.
+  5. Examine the mount point:
+     .
+     $ sudo -s # You must be root to see the mount point
+     $ ls /media/root
+     .
+     Make sure the contents of that directory match what you expect to see on
+     the drive.
+     .
+     Leave the root shell
+     $ exit
+_verification:
+  Verify that none of the system devices were mounted and their filesystems
+  are not available /media/root/<filesystem label>