X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Funit%2Ffrontend%2Fconnection_test.c;h=6ce11ff511a97a30f67f9d482d1368806ff21a94;hb=d81bfcccccea93ac261b75814e530a5fc50cfc58;hp=13ae221a0f509e6f8402c2c5c10e838f4df8b2ef;hpb=f8809a7d245d9147bba60d907dd11a398941d868;p=sysdb.git

diff --git a/t/unit/frontend/connection_test.c b/t/unit/frontend/connection_test.c
index 13ae221..6ce11ff 100644
--- a/t/unit/frontend/connection_test.c
+++ b/t/unit/frontend/connection_test.c
@@ -189,13 +189,13 @@ connection_startup(sdb_conn_t *conn)
 			username, check, expected);
 
 	mock_conn_rewind(conn);
-	check = sdb_connection_read(conn);
+	check = sdb_connection_handle(conn);
 	fail_unless(check == expected,
-			"On startup: sdb_connection_read() = %zi; expected: %zi",
+			"On startup: sdb_connection_handle() = %zi; expected: %zi",
 			check, expected);
 
 	fail_unless(sdb_strbuf_len(conn->errbuf) == 0,
-			"sdb_connection_read() left %zu bytes in the error "
+			"sdb_connection_handle() left %zu bytes in the error "
 			"buffer (%s); expected: 0", sdb_strbuf_len(conn->errbuf),
 			sdb_strbuf_string(conn->errbuf));
 
@@ -234,6 +234,7 @@ START_TEST(test_conn_accept)
 
 	unlink(socket_path);
 	sdb_connection_close(conn);
+	sdb_object_deref(SDB_OBJ(conn));
 	pthread_join(thr, NULL);
 }
 END_TEST
@@ -282,24 +283,24 @@ START_TEST(test_conn_setup)
 		}
 
 		mock_conn_rewind(conn);
-		check = sdb_connection_read(conn);
+		check = sdb_connection_handle(conn);
 		fail_unless(check == expected,
-				"sdb_connection_read() = %zi; expected: %zi",
+				"sdb_connection_handle() = %zi; expected: %zi",
 				check, expected);
 
 		fail_unless(sdb_strbuf_len(conn->buf) == 0,
-				"sdb_connection_read() left %zu bytes in the buffer; "
+				"sdb_connection_handle() left %zu bytes in the buffer; "
 				"expected: 0", sdb_strbuf_len(conn->buf));
 
 		if (golden_data[i].err) {
 			const char *err = sdb_strbuf_string(conn->errbuf);
 			fail_unless(strcmp(err, golden_data[i].err) == 0,
-					"sdb_connection_read(): got error '%s'; "
+					"sdb_connection_handle(): got error '%s'; "
 					"expected: '%s'", err, golden_data[i].err);
 		}
 		else
 			fail_unless(sdb_strbuf_len(conn->errbuf) == 0,
-					"sdb_connection_read() left %zu bytes in the error "
+					"sdb_connection_handle() left %zu bytes in the error "
 					"buffer (%s); expected: 0", sdb_strbuf_len(conn->errbuf),
 					sdb_strbuf_string(conn->errbuf));
 	}
@@ -376,44 +377,44 @@ START_TEST(test_conn_io)
 				check, msg_len);
 
 		mock_conn_rewind(conn);
-		check = sdb_connection_read(conn);
+		check = sdb_connection_handle(conn);
 		fail_unless(check == (ssize_t)msg_len,
-				"sdb_connection_read() = %zi; expected: %zu",
+				"sdb_connection_handle() = %zi; expected: %zu",
 				check, msg_len);
 
 		if (golden_data[i].buf_len) {
 			/* partial commands need to be stored in the object */
 			fail_unless(conn->cmd == golden_data[i].code,
-					"sdb_connection_read() set partial command "
+					"sdb_connection_handle() set partial command "
 					"to %u; expected: %u", conn->cmd, golden_data[i].code);
 			fail_unless(conn->cmd_len > golden_data[i].buf_len,
-					"sdb_connection_read() set partial command length "
+					"sdb_connection_handle() set partial command length "
 					"to %u; expected: > %u", conn->cmd_len,
 					golden_data[i].buf_len);
 		}
 		else {
 			fail_unless(conn->cmd == SDB_CONNECTION_IDLE,
-					"sdb_connection_read() did not reset command; "
+					"sdb_connection_handle() did not reset command; "
 					"got %u; expected: %u", conn->cmd, SDB_CONNECTION_IDLE);
 			fail_unless(conn->cmd_len == 0,
-					"sdb_connection_read() did not reset command length; "
+					"sdb_connection_handle() did not reset command length; "
 					"got %u; expected: 0", conn->cmd_len);
 		}
 
 		fail_unless(sdb_strbuf_len(conn->buf) == golden_data[i].buf_len,
-				"sdb_connection_read() left %zu bytes in the buffer; "
+				"sdb_connection_handle() left %zu bytes in the buffer; "
 				"expected: %zu", sdb_strbuf_len(conn->buf),
 				golden_data[i].buf_len);
 
 		if (golden_data[i].err) {
 			const char *err = sdb_strbuf_string(conn->errbuf);
 			fail_unless(strcmp(err, golden_data[i].err) == 0,
-					"sdb_connection_read(): got error '%s'; "
+					"sdb_connection_handle(): got error '%s'; "
 					"expected: '%s'", err, golden_data[i].err);
 		}
 		else
 			fail_unless(sdb_strbuf_len(conn->errbuf) == 0,
-					"sdb_connection_read() left %zu bytes in the error "
+					"sdb_connection_handle() left %zu bytes in the error "
 					"buffer; expected: 0", sdb_strbuf_len(conn->errbuf));
 	}