1
diff --git a/run-tests.sh b/run-tests.sh
2
index f069bfb..d9e3ada 100755
3
--- a/run-tests.sh
4
+++ b/run-tests.sh
5
@@ -16,7 +16,7 @@
6
16
16
7
17
set -e
17
set -e
8
18
18
10
19
TESTS_EXTRAS_URL="https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/tests-extras"
19
TESTS_EXTRAS_URL="https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/stack-snaps-tools"
11
20
TESTS_EXTRAS_PATH=".tests-extras"
20
TESTS_EXTRAS_PATH=".tests-extras"
12
21
21
13
22
show_help() {
22
show_help() {
14
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
15
index 446a9e3..9128540 100644
16
--- a/tests/lib/utilities.sh
17
+++ b/tests/lib/utilities.sh
18
@@ -10,7 +10,7 @@ snap_install() {
19
10
		# Need first install from store to get all necessary assertions into
10
		# Need first install from store to get all necessary assertions into
20
11
		# place. Second local install will then bring in our locally built
11
		# place. Second local install will then bring in our locally built
21
12
		# snap.
12
		# snap.
23
13
		snap install $name
13
		snap install --channel=latest/stable $name
24
14
		snap install --dangerous $PROJECT_PATH/$name*_amd64.snap
14
		snap install --dangerous $PROJECT_PATH/$name*_amd64.snap
25
15
	fi
15
	fi
26
16
}
16
}
27
diff --git a/tests/main/suspend-resume/task.yaml b/tests/main/suspend-resume/task.yaml
28
index 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
60
    # is correctly setting up the ethernet port again.
60
    # is correctly setting up the ethernet port again.
33
61
    journalctl --flush -u $service
61
    journalctl --flush -u $service
34
62
    touch $PROJECT_PATH/systemd-suspend/wakeup
62
    touch $PROJECT_PATH/systemd-suspend/wakeup
35
63
    sleep 4
36
63
64
37
64
    journalctl --no-pager -u $service | grep 'manager: wake requested (sleeping: yes  enabled: yes)'
65
    journalctl --no-pager -u $service | grep 'manager: wake requested (sleeping: yes  enabled: yes)'
38
65
    journalctl --no-pager -u $service | grep 'manager: NetworkManager state is now CONNECTED_LOCAL'
66
    journalctl --no-pager -u $service | grep 'manager: NetworkManager state is now CONNECTED_LOCAL'
39
66
    journalctl --no-pager -u $service | grep 'manager: NetworkManager state is now CONNECTED_GLOBAL'
67
    journalctl --no-pager -u $service | grep 'manager: NetworkManager state is now CONNECTED_GLOBAL'
40
67
    journalctl --no-pager -u $service | grep 'device (wlan1): Activation: successful, device activated.'
68
    journalctl --no-pager -u $service | grep 'device (wlan1): Activation: successful, device activated.'
41
68
69
44
69
    ifconfig | grep wlan1
70
    ip address show wlan1 | grep UP
45
70
    /snap/bin/network-manager.nmcli d | grep -v 'wlan1.*connected'
71
    /snap/bin/network-manager.nmcli d | grep 'wlan1.*connected'
Status:	Merged
Approved by:	Alfonso Sanchez-Beato on 2020-07-07
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)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
System Enablement Bot	continuous-integration	2020-07-07	Approve on 2020-07-07
Review via email: mp+386952@code.launchpad.net