[glib-networking/rufferson/openssl/tests/other: 4/7] Re-enable test_sync_op_during_handshake and test_socket_timeout tests



commit 7fbc435a1982a845d0a031709db9bfc188e74996
Author: Ruslan N. Marchenko <me ruff mobi>
Date:   Sat Jun 20 09:32:05 2020 +0200

    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

 tls/tests/connection.c | 12 ++----------
 1 file 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]