Merge ~kzapalowicz/snappy-hwe-snaps/+git/engineering-tests:fix/validate-pxu-files into ~snappy-hwe-team/snappy-hwe-snaps/+git/engineering-tests:master

Proposed by Konrad Zapałowicz
Status: Merged
Approved by: Jim Hodapp
Approved revision: 48d78977a76f6230de2bbafafcfb89a3f613685b
Merged at revision: 56a23a4d9de105e77fd0ddc81aba742aab0878e9
Proposed branch: ~kzapalowicz/snappy-hwe-snaps/+git/engineering-tests:fix/validate-pxu-files
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/engineering-tests:master
Diff against target: 15 lines (+0/-4)
1 file modified
media-hub/units/media-hub-snap.pxu (+0/-4)
Reviewer Review Type Date Requested Status
Jim Hodapp (community) Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+322584@code.launchpad.net

Description of the change

media-hub: fix category id field clash for test units

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Jim Hodapp (jhodapp) wrote :

This isn't the right approach, take a look at the network-manager one. You only need to define the top level id in one .pxu file for generic media-hub, and then the snap-specific pxu file wouldn't have the definition at all.

https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/engineering-tests/tree/network-manager/units/network-manager.pxu

review: Needs Fixing
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Jim Hodapp (jhodapp) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/media-hub/units/media-hub-snap.pxu b/media-hub/units/media-hub-snap.pxu
2index 1b2734f..24ad2bc 100644
3--- a/media-hub/units/media-hub-snap.pxu
4+++ b/media-hub/units/media-hub-snap.pxu
5@@ -4,10 +4,6 @@
6 # Written by:
7 # Alfonso Sánchez-Beato <alfonso.sanchez-beato@canonical.com>
8
9-unit: category
10-id: media_hub
11-_name: media-hub
12-
13 id: media_hub/snap_classic/play_wav
14 category_id: media_hub
15 plugin: manual

Subscribers

People subscribed via source and target branches