snappy-hwe-snaps

Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:fix-tests into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master

  1. Git
  2. lp:~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager
  3. fix-tests
  4. Merge into master
Proposed by Alfonso Sanchez-Beato
Status: Merged
Approved by: Simon Fels
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)
Reviewer Review Type Date Requested Status
Simon Fels Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+319062@code.launchpad.net

Commit message

Run NM unit tests

Description of the change

Run NM unit tests

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:03d43a2f919dc6c1afd3d8dd470b4756c22e4c36
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1183/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/231/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1090/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1183/rebuild

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

FAILED: Continuous integration, rev:65ae571269fc499d4b66600e3fd8656991fc03fb
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1185/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/233/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1094/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/912/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1185/rebuild

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

FAILED: Continuous integration, rev:65ae571269fc499d4b66600e3fd8656991fc03fb
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1188/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/236/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1098/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/914/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1188/rebuild

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

PASSED: Continuous integration, rev:4ee83393b8179aae8528d93f0028007b18a6767c
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1191/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/239
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1099/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/917

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1191/rebuild

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

FAILED: Continuous integration, rev:4ee83393b8179aae8528d93f0028007b18a6767c
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1192/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/240/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1100/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1192/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Simon Fels (morphis) :
review: Needs Fixing
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) :
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:4ee83393b8179aae8528d93f0028007b18a6767c
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1196/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/244/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1104/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1196/rebuild

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

FAILED: Continuous integration, rev:4ee83393b8179aae8528d93f0028007b18a6767c
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1197/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/245/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1105/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1197/rebuild

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

PASSED: Continuous integration, rev:7b9f5c983eca62ffb1a8f8559d1d73b842bcbf02
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1199/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/247
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1108/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/922

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1199/rebuild

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

FAILED: Continuous integration, rev:7b9f5c983eca62ffb1a8f8559d1d73b842bcbf02
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1202/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/250/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1109/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1202/rebuild

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

FAILED: Continuous integration, rev:6ee93ce3da8cdcee5d96112eecbabadd347f4bcf
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1204/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/252/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1112/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1204/rebuild

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

PASSED: Continuous integration, rev:1b6d498c388694d54d86f6528ef7b91f93280828
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1205/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/253
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1113/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/924

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1205/rebuild

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

FAILED: Continuous integration, rev:6ee93ce3da8cdcee5d96112eecbabadd347f4bcf
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1206/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/254/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1114/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1206/rebuild

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

FAILED: Continuous integration, rev:6ee93ce3da8cdcee5d96112eecbabadd347f4bcf
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1207/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/255/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1115/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1207/rebuild

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

PASSED: Continuous integration, rev:6ee93ce3da8cdcee5d96112eecbabadd347f4bcf
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1215/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/263
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1126/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/933

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1215/rebuild

review: Approve (continuous-integration)
Revision history for this message
Matteo Croce (teknoraver) :
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

@matteo, nice catch, fixed now

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:f4a05c251884b8199a34048a095138886c600726
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1219/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/267
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1127/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/935

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1219/rebuild

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

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.gitignore b/.gitignore
2index 082484d..3568cd0 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -1 +1,5 @@
6+/parts/
7+/stage/
8+/prime/
9+network-manager_*.snap
10 .tests-extras
11diff --git a/snapcraft.yaml b/snapcraft.yaml
12index b809f7b..3498a9b 100644
13--- a/snapcraft.yaml
14+++ b/snapcraft.yaml
15@@ -1,5 +1,5 @@
16 name: network-manager
17-version: 1.2.2-11
18+version: 1.2.2-11-dev
19 summary: Network management framework
20 description: |
21 NetworkManager is a system network service that manages your network
22@@ -74,11 +74,7 @@ parts:
23
24 source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager
25 source-type: git
26- # For development you can directly build from the xenial branch if
27- # needed. Otherwise use the tag to the latest version which will be
28- # used by the published snap.
29- # source-branch: network-manager/xenial/1.2.2
30- source-tag: network-manager-xenial-1.2.2-2
31+ source-branch: network-manager/xenial/1.2.2
32
33 build-packages:
34 - intltool
35@@ -162,6 +158,11 @@ parts:
36 - --with-libsoup=no
37 # We want to support ModemManager
38 - --with-modem-manager-1=yes
39+ - --enable-tests=yes
40+
41+ install: |
42+ # Run all tests NetworkManager ships by default
43+ make check
44
45 # Filter files pulled in by stage-packages so they aren't
46 # included in the final snap. We only need them to build
47diff --git a/tests/main/wifi-connect-secured-ap/task.yaml b/tests/main/wifi-connect-secured-ap/task.yaml
48index 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 sleep 0.5
53
54 # Setup the AP on wlan0
55- /snap/bin/wifi-ap.config set wifi.interface wlan0
56- /snap/bin/wifi-ap.config set wifi.ssid $WIFI_SSID
57- /snap/bin/wifi-ap.config set wifi.security wpa2
58- /snap/bin/wifi-ap.config set wifi.security-passphrase $WIFI_PASSPHRASE
59+ /snap/bin/wifi-ap.config set wifi.interface=wlan0
60+ /snap/bin/wifi-ap.config set wifi.ssid=$WIFI_SSID
61+ /snap/bin/wifi-ap.config set wifi.security=wpa2
62+ /snap/bin/wifi-ap.config set wifi.security-passphrase=$WIFI_PASSPHRASE
63
64 # AP needs a bit to appear and be visible for NetworkManager
65 /snap/bin/network-manager.nmcli d wifi rescan

Subscribers

People subscribed via source and target branches