1
diff --git a/.gitignore b/.gitignore
2
index 082484d..3568cd0 100644
3
--- a/.gitignore
4
+++ b/.gitignore
5
@@ -1 +1,5 @@
6
1
/parts/
7
2
/stage/
8
3
/prime/
9
4
network-manager_*.snap
10
1
.tests-extras
5
.tests-extras
11
diff --git a/snapcraft.yaml b/snapcraft.yaml
12
index b809f7b..3498a9b 100644
13
--- a/snapcraft.yaml
14
+++ b/snapcraft.yaml
15
@@ -1,5 +1,5 @@
16
1
name: network-manager
1
name: network-manager
18
2
version: 1.2.2-11
2
version: 1.2.2-11-dev
19
3
summary: Network management framework
3
summary: Network management framework
20
4
description: |
4
description: |
21
5
  NetworkManager is a system network service that manages your network
5
  NetworkManager is a system network service that manages your network
22
@@ -74,11 +74,7 @@ parts:
23
74
74
24
75
    source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager
75
    source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager
25
76
    source-type: git
76
    source-type: git
31
77
    # For development you can directly build from the xenial branch if
77
    source-branch: network-manager/xenial/1.2.2
27
78
    # needed. Otherwise use the tag to the latest version which will be
28
79
    # used by the published snap.
29
80
    # source-branch: network-manager/xenial/1.2.2
30
81
    source-tag: network-manager-xenial-1.2.2-2
32
82
78
33
83
    build-packages:
79
    build-packages:
34
84
      - intltool
80
      - intltool
35
@@ -162,6 +158,11 @@ parts:
36
162
      - --with-libsoup=no
158
      - --with-libsoup=no
37
163
      # We want to support ModemManager
159
      # We want to support ModemManager
38
164
      - --with-modem-manager-1=yes
160
      - --with-modem-manager-1=yes
39
161
      - --enable-tests=yes
40
162
41
163
    install: |
42
164
      # Run all tests NetworkManager ships by default
43
165
      make check
44
165
166
45
166
    # Filter files pulled in by stage-packages so they aren't
167
    # Filter files pulled in by stage-packages so they aren't
46
167
    # included in the final snap. We only need them to build
168
    # included in the final snap. We only need them to build
47
diff --git a/tests/main/wifi-connect-secured-ap/task.yaml b/tests/main/wifi-connect-secured-ap/task.yaml
48
index aa6a70c..4db7449 100644
49
--- a/tests/main/wifi-connect-secured-ap/task.yaml
50
+++ b/tests/main/wifi-connect-secured-ap/task.yaml
51
@@ -19,10 +19,10 @@ execute: |
52
19
    sleep 0.5
19
    sleep 0.5
53
20
20
54
21
    # Setup the AP on wlan0
21
    # Setup the AP on wlan0
59
22
    /snap/bin/wifi-ap.config set wifi.interface wlan0
22
    /snap/bin/wifi-ap.config set wifi.interface=wlan0
60
23
    /snap/bin/wifi-ap.config set wifi.ssid $WIFI_SSID
23
    /snap/bin/wifi-ap.config set wifi.ssid=$WIFI_SSID
61
24
    /snap/bin/wifi-ap.config set wifi.security wpa2
24
    /snap/bin/wifi-ap.config set wifi.security=wpa2
62
25
    /snap/bin/wifi-ap.config set wifi.security-passphrase $WIFI_PASSPHRASE
25
    /snap/bin/wifi-ap.config set wifi.security-passphrase=$WIFI_PASSPHRASE
63
26
26
64
27
    # AP needs a bit to appear and be visible for NetworkManager
27
    # AP needs a bit to appear and be visible for NetworkManager
65
28
    /snap/bin/network-manager.nmcli d wifi rescan
28
    /snap/bin/network-manager.nmcli d wifi rescan
Status:	Merged
Approved by:	Simon Fels on 2017-03-07
Approved revision:	f4a05c251884b8199a34048a095138886c600726
Merged at revision:	05f56594a2200e69cd17144a3cb98dd3ea606388
Proposed branch:	~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:fix-tests
Merge into:	~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master
Diff against target:	65 lines (+15/-10) 3 files modified .gitignore (+4/-0) snapcraft.yaml (+7/-6) tests/main/wifi-connect-secured-ap/task.yaml (+4/-4)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Simon Fels			Approve on 2017-03-07
System Enablement Bot	continuous-integration	2017-03-06	Approve on 2017-03-07
Review via email: mp+319062@code.launchpad.net