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
1diff --git a/units/wireless/jobs.pxu b/units/wireless/jobs.pxu
2index e203e6c..427596c 100644
3--- a/units/wireless/jobs.pxu
4+++ b/units/wireless/jobs.pxu
5@@ -15,7 +15,7 @@ _description:
6 Check system can find a wireless network AP nearby
7 flags: preserve-locale also-after-suspend also-after-suspend-manual
8 requires:
9- {%- if "SNAP_NAME" in __system_env__ %}
10+ {%- if __on_ubuntucore__ %}
11 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
12 {% endif -%}
13
14@@ -36,7 +36,7 @@ category_id: com.canonical.plainbox::wireless
15 estimated_duration: 30.0
16 flags: preserve-locale also-after-suspend also-after-suspend-manual
17 requires:
18- {%- if "SNAP_NAME" in __system_env__ %}
19+ {%- if __on_ubuntucore__ %}
20 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
21 {% endif -%}
22
23@@ -57,7 +57,7 @@ category_id: com.canonical.plainbox::wireless
24 estimated_duration: 30.0
25 flags: preserve-locale also-after-suspend also-after-suspend-manual
26 requires:
27- {%- if "SNAP_NAME" in __system_env__ %}
28+ {%- if __on_ubuntucore__ %}
29 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
30 {% endif -%}
31
32@@ -79,7 +79,7 @@ estimated_duration: 30.0
33 flags: preserve-locale also-after-suspend also-after-suspend-manual
34 requires:
35 wireless_sta_protocol.{{ interface }}_n == 'supported'
36- {%- if "SNAP_NAME" in __system_env__ %}
37+ {%- if __on_ubuntucore__ %}
38 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
39 {% endif -%}
40
41@@ -101,7 +101,7 @@ estimated_duration: 30.0
42 flags: preserve-locale also-after-suspend also-after-suspend-manual
43 requires:
44 wireless_sta_protocol.{{ interface }}_n == 'supported'
45- {%- if "SNAP_NAME" in __system_env__ %}
46+ {%- if __on_ubuntucore__ %}
47 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
48 {% endif -%}
49
50@@ -123,7 +123,7 @@ estimated_duration: 30.0
51 flags: preserve-locale also-after-suspend also-after-suspend-manual
52 requires:
53 wireless_sta_protocol.{{ interface }}_ac == 'supported'
54- {%- if "SNAP_NAME" in __system_env__ %}
55+ {%- if __on_ubuntucore__ %}
56 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
57 {% endif -%}
58
59@@ -145,7 +145,7 @@ estimated_duration: 30.0
60 flags: preserve-locale also-after-suspend also-after-suspend-manual
61 requires:
62 wireless_sta_protocol.{{ interface }}_ac == 'supported'
63- {%- if "SNAP_NAME" in __system_env__ %}
64+ {%- if __on_ubuntucore__ %}
65 connections.slot == 'network-manager:service' and connections.plug == '{{ __system_env__["SNAP_NAME"] }}:network-manager'
66 {% endif -%}
67

Subscribers

People subscribed via source and target branches