From aaf6d27ce538fbaca8eb991214037d1c2e12e895 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 22 Oct 2018 16:14:23 +0200 Subject: [PATCH] test/meson: increase timeout for some tests During gitlab-ci, some tests may take a long time. Increase the default timeout. (cherry picked from commit 43b28e06ede9eca6488ba18fb3afb4895a9f368f) --- libnm/tests/meson.build | 9 +++++---- src/settings/plugins/ifcfg-rh/tests/meson.build | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build index 27fafb77e4..ae2f7124ca 100644 --- a/libnm/tests/meson.build +++ b/libnm/tests/meson.build @@ -1,8 +1,8 @@ test_units = [ - ['test-general', [libnm_utils, libnm_core]], - ['test-nm-client', []], - ['test-remote-settings-client', []], - ['test-secret-agent', []], + ['test-general', [libnm_utils, libnm_core], 30], + ['test-nm-client', [], 90], + ['test-remote-settings-client', [], 90], + ['test-secret-agent', [], 90], ] cflags = [ @@ -28,6 +28,7 @@ foreach test_unit: test_units test( 'libnm/' + test_unit[0], test_script, + timeout: test_unit[2], args: test_args + [exe.full_path()] ) endforeach diff --git a/src/settings/plugins/ifcfg-rh/tests/meson.build b/src/settings/plugins/ifcfg-rh/tests/meson.build index 0593f12d88..29bc96994d 100644 --- a/src/settings/plugins/ifcfg-rh/tests/meson.build +++ b/src/settings/plugins/ifcfg-rh/tests/meson.build @@ -12,5 +12,6 @@ exe = executable( test( 'ifcfg-rh/' + test_unit, test_script, + timeout: 90, args: test_args + [exe.full_path()] )