diff options
author | Dan Winship <danw@gnome.org> | 2014-02-17 22:29:44 -0500 |
---|---|---|
committer | Dan Winship <danw@gnome.org> | 2014-02-17 22:35:04 -0500 |
commit | 2b0de6b7de7537c7d36ab33a7e5cf0e274ea3e23 (patch) | |
tree | 23fac5bb11876b8b5701e4d1e4d25ac05414d32f /tests/ssl-test.c | |
parent | a70ea67ade04ffc8048c93308d88ae70028dcf38 (diff) | |
download | libsoup-2b0de6b7de7537c7d36ab33a7e5cf0e274ea3e23.tar.gz |
tests: skip individual tests rather than whole test programs
Use g_skip_test() to skip individual tests rather than just returning
status 77 from the test program as a whole.
In several cases, we still end up skipping more than necessary, due to
test cases that need to be split up more.
Remove the "MISSING_REGRESSION_TESTS_PACKAGES" functionality, since
the skipped tests are now pointed out explicitly.
Diffstat (limited to 'tests/ssl-test.c')
-rw-r--r-- | tests/ssl-test.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/tests/ssl-test.c b/tests/ssl-test.c index 753a980c..3eb61af1 100644 --- a/tests/ssl-test.c +++ b/tests/ssl-test.c @@ -28,6 +28,8 @@ do_async_properties_tests (gconstpointer uri) { SoupSession *session; + SOUP_TEST_SKIP_IF_NO_TLS; + session = soup_test_session_new (SOUP_TYPE_SESSION_ASYNC, NULL); g_object_set (G_OBJECT (session), SOUP_SESSION_SSL_CA_FILE, "/dev/null", @@ -42,6 +44,8 @@ do_sync_properties_tests (gconstpointer uri) { SoupSession *session; + SOUP_TEST_SKIP_IF_NO_TLS; + session = soup_test_session_new (SOUP_TYPE_SESSION_SYNC, NULL); g_object_set (G_OBJECT (session), SOUP_SESSION_SSL_CA_FILE, "/dev/null", @@ -101,6 +105,8 @@ do_strict_tests (gconstpointer uri) { SoupSession *session; + SOUP_TEST_SKIP_IF_NO_TLS; + debug_printf (1, "\nstrict/nonstrict\n"); session = soup_test_session_new (SOUP_TYPE_SESSION_ASYNC, NULL); @@ -143,6 +149,8 @@ do_session_property_tests (void) char *ca_file; SoupSession *session; + SOUP_TEST_SKIP_IF_NO_TLS; + debug_printf (1, "session properties\n"); session = soup_session_async_new (); @@ -251,16 +259,13 @@ main (int argc, char **argv) test_init (argc, argv, NULL); - if (!tls_available) { - test_cleanup (); - return 77; /* SKIP */ + if (tls_available) { + server = soup_test_server_new_ssl (TRUE); + soup_server_add_handler (server, NULL, server_handler, NULL, NULL); + uri = g_strdup_printf ("https://127.0.0.1:%u/", + soup_server_get_port (server)); } - server = soup_test_server_new_ssl (TRUE); - soup_server_add_handler (server, NULL, server_handler, NULL, NULL); - uri = g_strdup_printf ("https://127.0.0.1:%u/", - soup_server_get_port (server)); - g_test_add_func ("/ssl/session-properties", do_session_property_tests); g_test_add_data_func ("/ssl/message-properties/async", uri, do_async_properties_tests); g_test_add_data_func ("/ssl/message-properties/sync", uri, do_sync_properties_tests); @@ -270,8 +275,10 @@ main (int argc, char **argv) ret = g_test_run (); - g_free (uri); - soup_test_server_quit_unref (server); + if (tls_available) { + g_free (uri); + soup_test_server_quit_unref (server); + } test_cleanup (); return ret; |