diff options
| author | Ruslan N. Marchenko <me@ruff.mobi> | 2020-06-20 09:32:05 +0200 |
|---|---|---|
| committer | Ruslan N. Marchenko <me@ruff.mobi> | 2020-07-06 10:45:05 +0200 |
| commit | 7fbc435a1982a845d0a031709db9bfc188e74996 (patch) | |
| tree | 59560c2f5cce6f0888524a5d7142cfc976363fa4 | |
| parent | 8fa661be7e22cc6da9302104968a041efc65ded7 (diff) | |
| download | glib-networking-7fbc435a1982a845d0a031709db9bfc188e74996.tar.gz | |
Re-enable test_sync_op_during_handshake and test_socket_timeout tests
* test_sync_op_during_handshake just works it seems
* test_socket_timeout works if we ignore server error which is not
consistent and changes from no-error to broken-pipe depending on
whether server is able to say last word or client bails first
| -rw-r--r-- | tls/tests/connection.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tls/tests/connection.c b/tls/tests/connection.c index 9c5d068..0b67534 100644 --- a/tls/tests/connection.c +++ b/tls/tests/connection.c @@ -2351,11 +2351,6 @@ test_sync_op_during_handshake (TestConnection *test, GIOStream *connection; GError *error = NULL; -#ifdef BACKEND_IS_OPENSSL - g_test_skip ("this is not yet passing with openssl"); - return; -#endif - connection = start_async_server_and_connect_to_it (test, G_TLS_AUTHENTICATION_NONE); test->client_connection = g_tls_client_connection_new (connection, test->identity, &error); g_assert_no_error (error); @@ -2386,11 +2381,6 @@ test_socket_timeout (TestConnection *test, GSocketClient *client; GError *error = NULL; -#ifdef BACKEND_IS_OPENSSL - g_test_skip ("this new test does not work with openssl, more research needed"); - return; -#endif - test->incoming_connection_delay = (gulong)(1.1 * G_USEC_PER_SEC); start_async_server_service (test, G_TLS_AUTHENTICATION_NONE, WRITE_THEN_CLOSE); @@ -2415,7 +2405,9 @@ test_socket_timeout (TestConnection *test, wait_until_server_finished (test); g_assert_error (test->read_error, G_IO_ERROR, G_IO_ERROR_TIMED_OUT); +#ifndef BACKEND_IS_OPENSSL g_assert_error (test->server_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS); +#endif } static void |