lib-ssl-iostream: test-iostream-ssl - Make finishing the ssl streams more robust.

Fixes:

Panic: file ostream.c: line 59 (o_stream_close_full): assertion failed: (stream->real_stream->error_handling_disabled)

diff --git a/src/lib-ssl-iostream/test-iostream-ssl.c b/src/lib-ssl-iostream/test-iostream-ssl.c
index 4dd7679d701eb28636d45db8eb9e0ff95079455d..b2533acb8bc8be1cb2fe19e53d1e76529119b98b 100644 (file)
--- a/src/lib-ssl-iostream/test-iostream-ssl.c
+++ b/src/lib-ssl-iostream/test-iostream-ssl.c
@@ -29,6 +29,8 @@ struct test_endpoint {
        bool failed;
 
        struct test_endpoint *other;
+
+       bool finished:1;
 };
 
 static void send_output(struct test_endpoint *ep)
@@ -41,6 +43,21 @@ static void send_output(struct test_endpoint *ep)
        ep->sent += amt;
 }
 
+static int flush_output(struct test_endpoint *ep, bool finish)
+{
+       int ret = (finish ?
+                  o_stream_finish(ep->output) : o_stream_flush(ep->output));
+       test_assert(ret >= 0);
+
+       if (ret > 0) {
+               if (finish)
+                       ep->finished = TRUE;
+               if (ep->other->finished)
+                       io_loop_stop(current_ioloop);
+       }
+       return ret;
+}
+
 static void handshake_input_callback(struct test_endpoint *ep)
 {
        if (ep->failed)
@@ -59,9 +76,12 @@ static void handshake_input_callback(struct test_endpoint *ep)
 static int bufsize_flush_callback(struct test_endpoint *ep)
 {
        io_loop_stop(current_ioloop);
-       int ret = o_stream_flush(ep->output);
-       test_assert(ret >= 0);
-       return ret;
+       return flush_output(ep, FALSE);
+}
+
+static int bufsize_finish_callback(struct test_endpoint *ep)
+{
+       return flush_output(ep, TRUE);
 }
 
 static void bufsize_input_callback(struct test_endpoint *ep)
@@ -77,11 +97,19 @@ static void bufsize_input_callback(struct test_endpoint *ep)
        i_stream_skip(ep->input, I_MIN(size, wanted));
 }
 
+static void bufsize_discard_callback(struct test_endpoint *ep)
+{
+       const unsigned char *data;
+       size_t size;
+
+       test_assert(i_stream_read_bytes(ep->input, &data, &size, 1) > -1 ||
+                   ep->input->stream_errno == 0);
+       i_stream_skip(ep->input, size);
+}
+
 static int small_packets_flush_callback(struct test_endpoint *ep)
 {
-       int ret = o_stream_flush(ep->output);
-       test_assert(ret >= 0);
-       return ret;
+       return flush_output(ep, FALSE);
 }
 
 static void small_packets_input_callback(struct test_endpoint *ep)
@@ -96,7 +124,8 @@ static void small_packets_input_callback(struct test_endpoint *ep)
        }
 
        size = 0;
-       test_assert((ret = i_stream_read_bytes(ep->input, &data, &size, wanted)) > -1);
+       test_assert((ret = i_stream_read_bytes(ep->input, &data, &size, wanted)) > -1 ||
+                   ep->input->stream_errno == 0);
 
        if (size > wanted)
                i_stream_set_input_pending(ep->input, TRUE);
@@ -114,7 +143,7 @@ static void small_packets_input_callback(struct test_endpoint *ep)
        }
 
        if (ep->sent > MAX_SENT_BYTES)
-               io_loop_stop(current_ioloop);
+               (void)flush_output(ep, TRUE);
        else
                send_output(ep);
 }
@@ -418,8 +447,15 @@ static void test_iostream_ssl_get_buffer_avail_size(void)
                io_loop_run(ioloop);
        }
 
-       test_assert(o_stream_finish(server->output) >= 0);
-       test_assert(o_stream_finish(client->output) >= 0);
+       io_remove(&server->io);
+       io_remove(&client->io);
+       o_stream_set_flush_callback(server->output, bufsize_finish_callback, server);
+       o_stream_set_flush_callback(client->output, bufsize_finish_callback, client);
+       server->io = io_add_istream(server->input, bufsize_discard_callback, server);
+       client->io = io_add_istream(client->input, bufsize_discard_callback, client);
+       o_stream_set_flush_pending(server->output, TRUE);
+       o_stream_set_flush_pending(client->output, TRUE);
+       io_loop_run(ioloop);
 
        i_stream_unref(&server->input);
        o_stream_unref(&server->output);
@@ -494,8 +530,6 @@ static void test_iostream_ssl_small_packets(void)
 
        test_assert(server->sent > MAX_SENT_BYTES ||
                    client->sent > MAX_SENT_BYTES);
-       test_assert(o_stream_finish(server->output) >= 0);
-       test_assert(o_stream_finish(client->output) >= 0);
 
        i_stream_unref(&server->input);
        o_stream_unref(&server->output);