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: Alfonso Sanchez-Beato
Approved revision: 4d764977fb97e9245bc61a2fd9721624f43b85a0
Merged at revision: 0dce529ca357a730bcb631459b9494bd39825624
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: 45 lines (+5/-4)
3 files modified
run-tests.sh (+1/-1)
tests/lib/utilities.sh (+1/-1)
tests/main/suspend-resume/task.yaml (+3/-2)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve
Review via email: mp+386952@code.launchpad.net

Commit message

tests/utilities: install from latest track
tests/suspend-resume: wait a bit after waking up

Description of the change

tests/utilities: install from latest track
tests/suspend-resume: wait a bit after waking up

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Successfully build documentation, rev: ee1ec3dd261e8a3656e02a980b295c680e17938a

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1327/

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

FAILED: Continuous integration, rev:ee1ec3dd261e8a3656e02a980b295c680e17938a
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/505/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/538/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/538
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/538
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/538
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1327
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1069
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1118/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/505/rebuild

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

PASSED: Successfully build documentation, rev: ee1ec3dd261e8a3656e02a980b295c680e17938a

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1328/

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

FAILED: Continuous integration, rev:ee1ec3dd261e8a3656e02a980b295c680e17938a
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/506/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/539/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/539
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/539
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/539
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1328
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1070
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1119/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/506/rebuild

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

PASSED: Successfully build documentation, rev: 4d764977fb97e9245bc61a2fd9721624f43b85a0

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1329/

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

PASSED: Continuous integration, rev:4d764977fb97e9245bc61a2fd9721624f43b85a0
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/507/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/540
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/540
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/540
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/540
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1329
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1071
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1120/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/507/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/run-tests.sh b/run-tests.sh
2index f069bfb..d9e3ada 100755
3--- a/run-tests.sh
4+++ b/run-tests.sh
5@@ -16,7 +16,7 @@
6
7 set -e
8
9-TESTS_EXTRAS_URL="https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/tests-extras"
10+TESTS_EXTRAS_URL="https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/stack-snaps-tools"
11 TESTS_EXTRAS_PATH=".tests-extras"
12
13 show_help() {
14diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
15index 446a9e3..9128540 100644
16--- a/tests/lib/utilities.sh
17+++ b/tests/lib/utilities.sh
18@@ -10,7 +10,7 @@ snap_install() {
19 # Need first install from store to get all necessary assertions into
20 # place. Second local install will then bring in our locally built
21 # snap.
22- snap install $name
23+ snap install --channel=latest/stable $name
24 snap install --dangerous $PROJECT_PATH/$name*_amd64.snap
25 fi
26 }
27diff --git a/tests/main/suspend-resume/task.yaml b/tests/main/suspend-resume/task.yaml
28index 2f3e8c8..fc395d8 100644
29--- a/tests/main/suspend-resume/task.yaml
30+++ b/tests/main/suspend-resume/task.yaml
31@@ -60,11 +60,12 @@ execute: |
32 # is correctly setting up the ethernet port again.
33 journalctl --flush -u $service
34 touch $PROJECT_PATH/systemd-suspend/wakeup
35+ sleep 4
36
37 journalctl --no-pager -u $service | grep 'manager: wake requested (sleeping: yes enabled: yes)'
38 journalctl --no-pager -u $service | grep 'manager: NetworkManager state is now CONNECTED_LOCAL'
39 journalctl --no-pager -u $service | grep 'manager: NetworkManager state is now CONNECTED_GLOBAL'
40 journalctl --no-pager -u $service | grep 'device (wlan1): Activation: successful, device activated.'
41
42- ifconfig | grep wlan1
43- /snap/bin/network-manager.nmcli d | grep -v 'wlan1.*connected'
44+ ip address show wlan1 | grep UP
45+ /snap/bin/network-manager.nmcli d | grep 'wlan1.*connected'

Subscribers

People subscribed via source and target branches