mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests: make souphttpsrc unit test work even if http_proxy is set

Browse source 
We're testing with an http server on localhost, but don't support
an exception list for the http_proxy, so just unset the environment
variable to make sure we can run this test properly even if the
environment has http_proxy set.

Also, don't skip all tests if there is an issue with the SSL server,
just run the non-SSL tests then.

https://jenkins.qa.ubuntu.com/view/Raring/view/JHBuild%20Gnome/job/jhbuild-amd64-gst-plugins-good/
This commit is contained in:
Tim-Philipp Müller 2013-02-12 23:31:22 +00:00
parent e3430b0d07
commit 7d02a4dacb
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
tests/check/elements/souphttpsrc.c
View file

@ -445,12 +445,19 @@ done:
GST_END_TEST; GST_END_TEST;
static SoupServer *server; /* NULL */
static SoupServer *ssl_server; /* NULL */
static Suite * static Suite *
souphttpsrc_suite (void) souphttpsrc_suite (void)
{ {
TCase *tc_chain, *tc_internet;
Suite *s; Suite *s;
TCase *tc_chain, *tc_internet; /* we don't support exceptions from the proxy, so just unset the environment
* variable - in case it's set in the test environment it would otherwise
* prevent us from connecting to localhost (like jenkins.qa.ubuntu.com) */
g_unsetenv ("http_proxy");
s = suite_create ("souphttpsrc"); s = suite_create ("souphttpsrc");
tc_chain = tcase_create ("general"); tc_chain = tcase_create ("general");
@ -472,7 +479,7 @@ souphttpsrc_suite (void)
tcase_add_test (tc_chain, test_bad_user_digest_auth); tcase_add_test (tc_chain, test_bad_user_digest_auth);
tcase_add_test (tc_chain, test_bad_password_digest_auth); tcase_add_test (tc_chain, test_bad_password_digest_auth);
if (soup_ssl_supported) if (ssl_server != NULL)
tcase_add_test (tc_chain, test_https); tcase_add_test (tc_chain, test_https);
} else { } else {
g_print ("Skipping 12 souphttpsrc tests, couldn't start or connect to " g_print ("Skipping 12 souphttpsrc tests, couldn't start or connect to "
@ -577,9 +584,6 @@ server_callback (SoupServer * server, SoupMessage * msg,
GST_DEBUG (" -> %d %s", msg->status_code, msg->reason_phrase); GST_DEBUG (" -> %d %s", msg->status_code, msg->reason_phrase);
} }
static SoupServer *server; /* NULL */
static SoupServer *ssl_server; /* NULL */
static gboolean static gboolean
run_server (guint * http_port, guint * https_port) run_server (guint * http_port, guint * https_port)
{ {
@ -623,15 +627,12 @@ run_server (guint * http_port, guint * https_port)
SOUP_SERVER_SSL_CERT_FILE, ssl_cert_file, SOUP_SERVER_SSL_CERT_FILE, ssl_cert_file,
SOUP_SERVER_SSL_KEY_FILE, ssl_key_file, NULL); SOUP_SERVER_SSL_KEY_FILE, ssl_key_file, NULL);
if (!ssl_server) { if (ssl_server) {
GST_DEBUG ("Unable to bind to SSL server port %u", ssl_port); *https_port = soup_server_get_port (ssl_server);
stop_server (); GST_INFO ("HTTPS server listening on port %u", *https_port);
return FALSE; soup_server_add_handler (ssl_server, NULL, server_callback, NULL, NULL);
soup_server_run_async (ssl_server);
} }
*https_port = soup_server_get_port (ssl_server);
GST_INFO ("HTTPS server listening on port %u", *https_port);
soup_server_add_handler (ssl_server, NULL, server_callback, NULL, NULL);
soup_server_run_async (ssl_server);
} }
/* check if we can connect to our local http server */ /* check if we can connect to our local http server */
@ -650,7 +651,11 @@ run_server (guint * http_port, guint * https_port)
return FALSE; return FALSE;
} }
g_object_unref (conn); g_object_unref (conn);
conn = g_socket_client_connect_to_host (client, "127.0.0.1", *http_port,
if (ssl_server == NULL)
goto skip_https_check;
conn = g_socket_client_connect_to_host (client, "127.0.0.1", *https_port,
NULL, NULL); NULL, NULL);
if (conn == NULL) { if (conn == NULL) {
GST_INFO ("Couldn't connect to https server 127.0.0.1:%u", *https_port); GST_INFO ("Couldn't connect to https server 127.0.0.1:%u", *https_port);
@ -659,6 +664,9 @@ run_server (guint * http_port, guint * https_port)
return FALSE; return FALSE;
} }
g_object_unref (conn); g_object_unref (conn);
skip_https_check:
g_object_unref (client); g_object_unref (client);
} }