Checkbox Provider - Base

Merge ~sylvain-pineau/plainbox-provider-checkbox:is_snap_based_helper into plainbox-provider-checkbox:master

  1. Git
  2. lp:~sylvain-pineau/plainbox-provider-checkbox
  3. is_snap_based_helper
  4. Merge into master
Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 2a16c7ec93b9a2dd3b278850c7973516f24d3de1
Merged at revision: 0dae6f61b0e30889d64b2efd320c786578001369
Proposed branch: ~sylvain-pineau/plainbox-provider-checkbox:is_snap_based_helper
Merge into: plainbox-provider-checkbox:master
Diff against target: 66 lines (+7/-7)
1 file modified
units/wireless/jobs.pxu (+7/-7)
Reviewer Review Type Date Requested Status
Jonathan Cave (community) Approve
Review via email: mp+335303@code.launchpad.net

Description of the change

Update Wireless tests to check slot connections only when running on ubuntu core.

Requires: https://code.launchpad.net/~sylvain-pineau/plainbox/+git/plainbox/+merge/335304

Tested on a server image.

To post a comment you must log in.
Revision history for this message
Jonathan Cave (jocave) wrote :

LGTM +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/units/wireless/jobs.pxu b/units/wireless/jobs.pxu
index e203e6c..427596c 100644
--- a/units/wireless/jobs.pxu
+++ b/units/wireless/jobs.pxu
@@ -15,7 +15,7 @@ _description:
15 Check system can find a wireless network AP nearby15 Check system can find a wireless network AP nearby
16flags: preserve-locale also-after-suspend also-after-suspend-manual16flags: preserve-locale also-after-suspend also-after-suspend-manual
17requires:17requires:
18 {%- if "SNAP_NAME" in __system_env__ %}18 {%- if __on_ubuntucore__ %}
19 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'19 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
20 {% endif -%}20 {% endif -%}
2121
@@ -36,7 +36,7 @@ category_id: com.canonical.plainbox::wireless
36estimated_duration: 30.036estimated_duration: 30.0
37flags: preserve-locale also-after-suspend also-after-suspend-manual37flags: preserve-locale also-after-suspend also-after-suspend-manual
38requires:38requires:
39 {%- if "SNAP_NAME" in __system_env__ %}39 {%- if __on_ubuntucore__ %}
40 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'40 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
41 {% endif -%}41 {% endif -%}
4242
@@ -57,7 +57,7 @@ category_id: com.canonical.plainbox::wireless
57estimated_duration: 30.057estimated_duration: 30.0
58flags: preserve-locale also-after-suspend also-after-suspend-manual58flags: preserve-locale also-after-suspend also-after-suspend-manual
59requires:59requires:
60 {%- if "SNAP_NAME" in __system_env__ %}60 {%- if __on_ubuntucore__ %}
61 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'61 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
62 {% endif -%}62 {% endif -%}
6363
@@ -79,7 +79,7 @@ estimated_duration: 30.0
79flags: preserve-locale also-after-suspend also-after-suspend-manual79flags: preserve-locale also-after-suspend also-after-suspend-manual
80requires:80requires:
81 wireless_sta_protocol.{{ interface }}_n == 'supported'81 wireless_sta_protocol.{{ interface }}_n == 'supported'
82 {%- if "SNAP_NAME" in __system_env__ %}82 {%- if __on_ubuntucore__ %}
83 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'83 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
84 {% endif -%}84 {% endif -%}
8585
@@ -101,7 +101,7 @@ estimated_duration: 30.0
101flags: preserve-locale also-after-suspend also-after-suspend-manual101flags: preserve-locale also-after-suspend also-after-suspend-manual
102requires:102requires:
103 wireless_sta_protocol.{{ interface }}_n == 'supported'103 wireless_sta_protocol.{{ interface }}_n == 'supported'
104 {%- if "SNAP_NAME" in __system_env__ %}104 {%- if __on_ubuntucore__ %}
105 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'105 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
106 {% endif -%}106 {% endif -%}
107107
@@ -123,7 +123,7 @@ estimated_duration: 30.0
123flags: preserve-locale also-after-suspend also-after-suspend-manual123flags: preserve-locale also-after-suspend also-after-suspend-manual
124requires:124requires:
125 wireless_sta_protocol.{{ interface }}_ac == 'supported'125 wireless_sta_protocol.{{ interface }}_ac == 'supported'
126 {%- if "SNAP_NAME" in __system_env__ %}126 {%- if __on_ubuntucore__ %}
127 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'127 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
128 {% endif -%}128 {% endif -%}
129129
@@ -145,7 +145,7 @@ estimated_duration: 30.0
145flags: preserve-locale also-after-suspend also-after-suspend-manual145flags: preserve-locale also-after-suspend also-after-suspend-manual
146requires:146requires:
147 wireless_sta_protocol.{{ interface }}_ac == 'supported'147 wireless_sta_protocol.{{ interface }}_ac == 'supported'
148 {%- if "SNAP_NAME" in __system_env__ %}148 {%- if __on_ubuntucore__ %}
149 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'149 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
150 {% endif -%}150 {% endif -%}
151151

Subscribers

People subscribed via source and target branches