diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
| commit | 404ebe62622150e77e311777dff8617eb974e834 (patch) | |
| tree | cc7f73d3e435d5b3ee85e2bef833e8de1fb133e3 /libnm/tests | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Merge remote-tracking branch 'salsa/upstream' into upstream
Diffstat (limited to 'libnm/tests')
| -rw-r--r-- | libnm/tests/meson.build | 11 | ||||
| -rw-r--r-- | libnm/tests/test-secret-agent.c | 8 |
2 files changed, 10 insertions, 9 deletions
diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build index e2b88273..ae2f7124 100644 --- a/libnm/tests/meson.build +++ b/libnm/tests/meson.build @@ -1,14 +1,14 @@ 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 = [ '-DNETWORKMANAGER_COMPILATION_TEST', '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM', -] + nm_build_cflags +] foreach test_unit: test_units exe = executable( @@ -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/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c index 746a9e64..53110be6 100644 --- a/libnm/tests/test-secret-agent.c +++ b/libnm/tests/test-secret-agent.c @@ -111,8 +111,8 @@ done: static void test_secret_agent_cancel_get_secrets (NMSecretAgentOld *agent, - const gchar *connection_path, - const gchar *setting_name) + const char *connection_path, + const char *setting_name) { g_assert_not_reached (); } @@ -120,7 +120,7 @@ test_secret_agent_cancel_get_secrets (NMSecretAgentOld *agent, static void test_secret_agent_save_secrets (NMSecretAgentOld *agent, NMConnection *connection, - const gchar *connection_path, + const char *connection_path, NMSecretAgentOldSaveSecretsFunc callback, gpointer callback_data) { @@ -130,7 +130,7 @@ test_secret_agent_save_secrets (NMSecretAgentOld *agent, static void test_secret_agent_delete_secrets (NMSecretAgentOld *agent, NMConnection *connection, - const gchar *connection_path, + const char *connection_path, NMSecretAgentOldDeleteSecretsFunc callback, gpointer callback_data) { |