Merge ~alfonsosanchezbeato/network-manager:test-ci into network-manager:snap-1.10

[Alfonso Sanchez-Beato]

snap: test for CI

snap: test for CI

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:c2fba4bc55e6f882d5e7a1ca96bde09f075ba515
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/377/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/410/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/410/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/410/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/410/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1202
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/944
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/990/console

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

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:fac4a6e925fc19ade02642f77901e60a1c362294
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/378/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/411
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/411
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/411
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/411
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1203
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/945
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/991/console

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

review: Approve (continuous-integration)

[Tony Espy (awe)]

I'm not clear if this commit is temporary or not? Did you mean to check this in so that you could test your CI changes, or are these changes intended to be permanent so that we can build the snap using CI? Do we disable a similar set of tests in the old HWE nm build too?

If these changes are intended to be permanent, please add some more detail to your commit message. Something like:

snap: disable tests that fail lp builds

Some advanced integration tests (e.g. bonding, teaming, ...) that are trigged by 'make test' fail when NM is built by launchpad.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

It is permanent, otherwise the snap fails the build from launchpad. Yes, we did disable a few tests in the UC16 NM snap.

I have re-worked the commit to be more specific.

[Tony Espy (awe)]

Thanks for the changes. LGTM!

review: Approve

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2c95f33
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/stage/
+/parts/
+/prime/
+/snap/.snapcraft
diff --git a/debian/patches/disable-link-bond-test.patch b/debian/patches/disable-link-bond-test.patch
deleted file mode 100644
index e3237d8..0000000
--- a/debian/patches/disable-link-bond-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: build/src/platform/tests/test-link.c
-===================================================================
---- build.orig/src/platform/tests/test-link.c
-+++ build/src/platform/tests/test-link.c
-@@ -475,7 +475,8 @@ test_bond (void)
- 		return;
- 	}
- 
--	test_software (NM_LINK_TYPE_BOND, "bond");
-+	g_test_skip ("Skipping test for bonding...");
-+	/* test_software (NM_LINK_TYPE_BOND, "bond"); */
- }
- 
- static void
diff --git a/debian/patches/disable-link-team-test.patch b/debian/patches/disable-link-team-test.patch
deleted file mode 100644
index 775c086..0000000
--- a/debian/patches/disable-link-team-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: build/src/platform/tests/test-link.c
-===================================================================
---- build.orig/src/platform/tests/test-link.c
-+++ build/src/platform/tests/test-link.c
-@@ -482,7 +482,8 @@ test_bond (void)
- static void
- test_team (void)
- {
--	test_software (NM_LINK_TYPE_TEAM, "team");
-+	g_test_skip ("Skipping test for teaming...");
-+	/* test_software (NM_LINK_TYPE_TEAM, "team"); */
- }
- 
- static void
diff --git a/debian/patches/disable-tests-that-fail-under-launchpad-builds.patch b/debian/patches/disable-tests-that-fail-under-launchpad-builds.patch
new file mode 100644
index 0000000..f77ac03
--- /dev/null
+++ b/debian/patches/disable-tests-that-fail-under-launchpad-builds.patch
@@ -0,0 +1,87 @@
+diff --git a/src/devices/tests/test-arping.c b/src/devices/tests/test-arping.c
+index bcbc1140..2de53b2b 100644
+--- a/src/devices/tests/test-arping.c
++++ b/src/devices/tests/test-arping.c
+@@ -135,6 +135,9 @@ _nmtstp_init_tests (int *argc, char ***argv)
+ void
+ _nmtstp_setup_tests (void)
+ {
++	if (strstr (g_get_prgname(), "test-arping") != NULL)
++		return;
++
+ 	g_test_add ("/arping/1", test_fixture, NULL, fixture_setup, test_arping_1, fixture_teardown);
+ 	g_test_add ("/arping/2", test_fixture, NULL, fixture_setup, test_arping_2, fixture_teardown);
+ }
+diff --git a/src/platform/tests/test-address.c b/src/platform/tests/test-address.c
+index 93851ff7..a6e53c83 100644
+--- a/src/platform/tests/test-address.c
++++ b/src/platform/tests/test-address.c
+@@ -368,6 +368,9 @@ _nmtstp_init_tests (int *argc, char ***argv)
+ void
+ _nmtstp_setup_tests (void)
+ {
++	if (strstr (g_get_prgname(), "test-address-linux") != NULL)
++		return;
++
+ #define add_test_func(testpath, test_func) nmtstp_env1_add_test_func(testpath, test_func, FALSE)
+ 	add_test_func ("/address/ipv4/general", test_ip4_address_general);
+ 	add_test_func ("/address/ipv6/general", test_ip6_address_general);
+diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c
+index ef78cc24..37189d9f 100644
+--- a/src/platform/tests/test-link.c
++++ b/src/platform/tests/test-link.c
+@@ -475,13 +475,15 @@ test_bond (void)
+ 		return;
+ 	}
+ 
+-	test_software (NM_LINK_TYPE_BOND, "bond");
++	g_test_skip ("Skipping test for bonding...");
++	/* test_software (NM_LINK_TYPE_BOND, "bond"); */
+ }
+ 
+ static void
+ test_team (void)
+ {
+-	test_software (NM_LINK_TYPE_TEAM, "team");
++	g_test_skip ("Skipping test for teaming...");
++	/* test_software (NM_LINK_TYPE_TEAM, "team"); */
+ }
+ 
+ static void
+@@ -2533,6 +2535,9 @@ _nmtstp_setup_tests (void)
+ 	g_assert (!nm_platform_link_get_by_ifname (NM_PLATFORM_GET, SLAVE_NAME));
+ 	g_assert (!nm_platform_link_get_by_ifname (NM_PLATFORM_GET, PARENT_NAME));
+ 
++	if (strstr (g_get_prgname(), "test-link-linux") != NULL)
++		return;
++
+ 	g_test_add_func ("/link/bogus", test_bogus);
+ 	g_test_add_func ("/link/loopback", test_loopback);
+ 	g_test_add_func ("/link/internal", test_internal);
+diff --git a/src/platform/tests/test-nmp-object.c b/src/platform/tests/test-nmp-object.c
+index 3228de83..7f7174f5 100644
+--- a/src/platform/tests/test-nmp-object.c
++++ b/src/platform/tests/test-nmp-object.c
+@@ -587,7 +587,7 @@ main (int argc, char **argv)
+ 	}
+ 
+ 	g_test_add_func ("/nmp-object/obj-base", test_obj_base);
+-	g_test_add_func ("/nmp-object/cache_link", test_cache_link);
++	/*g_test_add_func ("/nmp-object/cache_link", test_cache_link);*/
+ 	g_test_add_func ("/nmp-object/cache_qdisc", test_cache_qdisc);
+ 
+ 	result = g_test_run ();
+diff --git a/src/platform/tests/test-route.c b/src/platform/tests/test-route.c
+index 13648f16..665a5937 100644
+--- a/src/platform/tests/test-route.c
++++ b/src/platform/tests/test-route.c
+@@ -885,6 +885,9 @@ _nmtstp_init_tests (int *argc, char ***argv)
+ void
+ _nmtstp_setup_tests (void)
+ {
++	if (strstr (g_get_prgname(), "test-route-linux") != NULL)
++		return;
++
+ #define add_test_func(testpath, test_func) nmtstp_env1_add_test_func(testpath, test_func, TRUE)
+ #define add_test_func_data(testpath, test_func, arg) nmtstp_env1_add_test_func_data(testpath, test_func, arg, TRUE)
+ 	add_test_func ("/route/ip4", test_ip4_route);
diff --git a/debian/patches/series b/debian/patches/series
index 0366f7e..0632066 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,8 +12,7 @@ libnm-Check-self-still-NMManager-or-not.patch
 Read-system-connections-from-run.patch
 e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch
 Support-for-WoWLAN.patch
-disable-link-bond-test.patch
 disable-libnm-glib-wifi-ap-test.patch
-disable-link-team-test.patch
 disable-libnm-glib-test-devices-array.patch
 add-snap-support.patch
+disable-tests-that-fail-under-launchpad-builds.patch