Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:not-run-all-test into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:snap-20

Proposed by Alfonso Sanchez-Beato
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: 4e84fb16de535377c9b96d5a24b07f9f27947802
Merged at revision: dc36c0b12f6cc0b21a02cd9120002542e8307472
Proposed branch: ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:not-run-all-test
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:snap-20
Diff against target: 115 lines (+97/-1)
2 files modified
snap-patch/networkmanager/0002-Disable-tests-failing-on-launchpad.patch (+96/-0)
snap/snapcraft.yaml (+1/-1)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve
Review via email: mp+387044@code.launchpad.net

Commit message

Enable again checks, after disabling some failing tests:
Some tests where failing due to limitations of the launchpad builders:
disable just those but run the rest of unit tests when building.

Description of the change

Enable again checks, after disabling some failing tests:
Some tests where failing due to limitations of the launchpad builders:
disable just those but run the rest of unit tests when building.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snap-patch/networkmanager/0002-Disable-tests-failing-on-launchpad.patch b/snap-patch/networkmanager/0002-Disable-tests-failing-on-launchpad.patch
2new file mode 100644
3index 0000000..98c5d5d
4--- /dev/null
5+++ b/snap-patch/networkmanager/0002-Disable-tests-failing-on-launchpad.patch
6@@ -0,0 +1,96 @@
7+From b4557f86c968d78e6000661931ee3c265e38002a Mon Sep 17 00:00:00 2001
8+From: snapcraft <snapcraft@canonical.com>
9+Date: Wed, 8 Jul 2020 14:34:37 +0200
10+Subject: [PATCH] Disable tests failing on launchpad
11+
12+---
13+ Makefile.am | 6 +-----
14+ Makefile.in | 4 ----
15+ src/devices/tests/meson.build | 1 -
16+ src/platform/tests/meson.build | 3 ---
17+ 4 files changed, 1 insertion(+), 13 deletions(-)
18+
19+diff --git a/Makefile.am b/Makefile.am
20+index b37aa4e71..f737b07db 100644
21+--- a/Makefile.am
22++++ b/Makefile.am
23+@@ -3730,15 +3730,12 @@ check_programs_norun += \
24+
25+ check_programs += \
26+ src/platform/tests/test-address-fake \
27+- src/platform/tests/test-address-linux \
28+ src/platform/tests/test-cleanup-fake \
29+ src/platform/tests/test-cleanup-linux \
30+ src/platform/tests/test-link-fake \
31+- src/platform/tests/test-link-linux \
32+ src/platform/tests/test-nmp-object \
33+ src/platform/tests/test-platform-general \
34+ src/platform/tests/test-route-fake \
35+- src/platform/tests/test-route-linux \
36+ $(NULL)
37+
38+ src_platform_tests_monitor_CPPFLAGS = $(src_cppflags_test)
39+@@ -3818,8 +3815,7 @@ src_devices_tests_ldflags = \
40+ $(SANITIZER_EXEC_LDFLAGS)
41+
42+ check_programs += \
43+- src/devices/tests/test-lldp \
44+- src/devices/tests/test-acd
45++ src/devices/tests/test-lldp
46+
47+ src_devices_tests_test_lldp_CPPFLAGS = $(src_cppflags_test)
48+ src_devices_tests_test_lldp_LDFLAGS = $(src_devices_tests_ldflags)
49+diff --git a/Makefile.in b/Makefile.in
50+index fba5b556a..f6489053d 100644
51+--- a/Makefile.in
52++++ b/Makefile.in
53+@@ -4705,16 +4705,12 @@ check_programs = shared/nm-utils/tests/test-shared-general \
54+ $(am__append_24) $(am__append_31) $(am__append_35) \
55+ $(am__append_44) src/dnsmasq/tests/test-dnsmasq-utils \
56+ src/platform/tests/test-address-fake \
57+- src/platform/tests/test-address-linux \
58+ src/platform/tests/test-cleanup-fake \
59+ src/platform/tests/test-cleanup-linux \
60+ src/platform/tests/test-link-fake \
61+- src/platform/tests/test-link-linux \
62+ src/platform/tests/test-nmp-object \
63+ src/platform/tests/test-platform-general \
64+ src/platform/tests/test-route-fake \
65+- src/platform/tests/test-route-linux $(NULL) \
66+- src/devices/tests/test-lldp src/devices/tests/test-acd \
67+ src/ndisc/tests/test-ndisc-fake \
68+ src/supplicant/tests/test-supplicant-config \
69+ src/tests/config/test-config src/tests/test-core \
70+diff --git a/src/devices/tests/meson.build b/src/devices/tests/meson.build
71+index bb53d1ee4..457d368c2 100644
72+--- a/src/devices/tests/meson.build
73++++ b/src/devices/tests/meson.build
74+@@ -1,5 +1,4 @@
75+ test_units = [
76+- 'test-acd',
77+ 'test-lldp',
78+ ]
79+
80+diff --git a/src/platform/tests/meson.build b/src/platform/tests/meson.build
81+index 6f7173b6d..342aa1c81 100644
82+--- a/src/platform/tests/meson.build
83++++ b/src/platform/tests/meson.build
84+@@ -3,15 +3,12 @@ test_linux_c_flags = test_c_flags + ['-DSETUP=nm_linux_platform_setup']
85+
86+ test_units = [
87+ ['test-address-fake', 'test-address.c', test_fake_c_flags, default_test_timeout],
88+- ['test-address-linux', 'test-address.c', test_linux_c_flags, default_test_timeout],
89+ ['test-cleanup-fake', 'test-cleanup.c', test_fake_c_flags, default_test_timeout],
90+ ['test-cleanup-linux', 'test-cleanup.c', test_linux_c_flags, default_test_timeout],
91+ ['test-link-fake', 'test-link.c', test_fake_c_flags, default_test_timeout],
92+- ['test-link-linux', 'test-link.c', test_linux_c_flags, 900],
93+ ['test-nmp-object', 'test-nmp-object.c', test_c_flags, default_test_timeout],
94+ ['test-platform-general', 'test-platform-general.c', test_c_flags, default_test_timeout],
95+ ['test-route-fake', 'test-route.c', test_fake_c_flags, default_test_timeout],
96+- ['test-route-linux', 'test-route.c', test_linux_c_flags, default_test_timeout],
97+ ]
98+
99+ foreach test_unit: test_units
100+--
101+2.25.1
102+
103diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
104index 0942716..ed91c05 100644
105--- a/snap/snapcraft.yaml
106+++ b/snap/snapcraft.yaml
107@@ -227,7 +227,7 @@ parts:
108 snapcraftctl build
109
110 # Run all tests NetworkManager ships by default
111- #make check
112+ make check
113 stage-packages:
114 - iputils-arping
115 - libasn1-8-heimdal

Subscribers

People subscribed via source and target branches