Merge ~kzapalowicz/snappy-hwe-snaps/+git/engineering-tests:feature/fix-ambiguous-test-cases into ~snappy-hwe-team/snappy-hwe-snaps/+git/engineering-tests:master

[Konrad Zapałowicz]

fix tpm and udisks2 test cases to be more
user-friendly

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

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

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

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

[Simon Fels (morphis)]

Approving for CI

review: Approve (continuous-integration)

diff --git a/tpm/units/tpm.pxu b/tpm/units/tpm.pxu
index cbbf256..b00bd89 100644
--- a/tpm/units/tpm.pxu
+++ b/tpm/units/tpm.pxu
@@ -15,9 +15,9 @@ plugin: manual
 _steps:
   1. Connect required tpm1.2 slots/plugs
   .
-     $ sudo snap connect tpm:network ubuntu-core:network
-     $ sudo snap connect tpm:network-bind ubuntu-core:network-bind
-     $ sudo snap connect tpm:tpm ubuntu-core:tpm
+     $ sudo snap connect tpm:network :network
+     $ sudo snap connect tpm:network-bind :network-bind
+     $ sudo snap connect tpm:tpm :tpm
   .
 _verification:
   Verify that you see the following when running snap interfaces:
diff --git a/udisks2/units/udisks2.pxu b/udisks2/units/udisks2.pxu
index d1081d5..a889427 100644
--- a/udisks2/units/udisks2.pxu
+++ b/udisks2/units/udisks2.pxu
@@ -21,6 +21,7 @@ _verification:
   Slot             Plug
   :mount-observe   udisks2
   udisks2:service  udisks2:client
+  -                udisks2:hardware-observe
 
 id: udisks2/client/can_communicate_with_udisksd
 category_id: udisks2
@@ -105,6 +106,9 @@ _steps:
      .
      Make sure the contents of that directory match what you expect to see on
      the drive.
+     .
+     Leave the root shell
+     $ exit
   5. Unmount the filesystem:
      .
      $ sudo udisks2.udisksctl unmount -b /dev/<device>1