snappy-hwe-snaps

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

  1. Git
  2. lp:~kzapalowicz/snappy-hwe-snaps/+git/engineering-tests
  3. feature/fix-ambiguous-test-cases
  4. Merge into master
Proposed by Konrad Zapałowicz
Status: Merged
Approved by: Simon Fels
Approved revision: eaacee0e562f3dd58cccaa5dd7c5d19b047bbcc9
Merged at revision: f988a9d86cd6ede46e81c3e04963426d901b2764
Proposed branch: ~kzapalowicz/snappy-hwe-snaps/+git/engineering-tests:feature/fix-ambiguous-test-cases
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/engineering-tests:master
Diff against target: 39 lines (+7/-3)
2 files modified
tpm/units/tpm.pxu (+3/-3)
udisks2/units/udisks2.pxu (+4/-0)
Reviewer Review Type Date Requested Status
Simon Fels continuous-integration Approve
System Enablement Bot continuous-integration Needs Fixing
Review via email: mp+317756@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

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)
Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve
Revision history for this message
Simon Fels (morphis) wrote :

Approving for CI

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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
15_steps:15_steps:
16 1. Connect required tpm1.2 slots/plugs16 1. Connect required tpm1.2 slots/plugs
17 .17 .
18 $ sudo snap connect tpm:network ubuntu-core:network18 $ sudo snap connect tpm:network :network
19 $ sudo snap connect tpm:network-bind ubuntu-core:network-bind19 $ sudo snap connect tpm:network-bind :network-bind
20 $ sudo snap connect tpm:tpm ubuntu-core:tpm20 $ sudo snap connect tpm:tpm :tpm
21 .21 .
22_verification:22_verification:
23 Verify that you see the following when running snap interfaces:23 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:
21 Slot Plug21 Slot Plug
22 :mount-observe udisks222 :mount-observe udisks2
23 udisks2:service udisks2:client23 udisks2:service udisks2:client
24 - udisks2:hardware-observe
2425
25id: udisks2/client/can_communicate_with_udisksd26id: udisks2/client/can_communicate_with_udisksd
26category_id: udisks227category_id: udisks2
@@ -105,6 +106,9 @@ _steps:
105 .106 .
106 Make sure the contents of that directory match what you expect to see on107 Make sure the contents of that directory match what you expect to see on
107 the drive.108 the drive.
109 .
110 Leave the root shell
111 $ exit
108 5. Unmount the filesystem:112 5. Unmount the filesystem:
109 .113 .
110 $ sudo udisks2.udisksctl unmount -b /dev/<device>1114 $ sudo udisks2.udisksctl unmount -b /dev/<device>1

Subscribers

People subscribed via source and target branches