From: Guus Sliepen <guus@meshlink.io>
Date: Wed, 27 May 2020 18:57:43 +0000 (+0200)
Subject: Update the channels-*-framed tests to test for isolated packets.
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=8167ca32341c888024061545ccf5c27504e26a9f;p=meshlink

Update the channels-*-framed tests to test for isolated packets.

The test sent a lot of packets in succession, and only at the end checked
if everything was received. This prevented it from detecting the case where
sending a single small frame would not cause the frame to be received.
---

diff --git a/test/channels-framed.c b/test/channels-framed.c
index b6d9928b..a26db750 100644
--- a/test/channels-framed.c
+++ b/test/channels-framed.c
@@ -13,10 +13,10 @@
 #include "../src/meshlink.h"
 #include "utils.h"
 
-static bool received_large;
-static bool received_zero;
 static size_t received;
 static struct sync_flag accept_flag;
+static struct sync_flag small_flag;
+static struct sync_flag large_flag;
 static struct sync_flag close_flag;
 
 static void receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
@@ -34,11 +34,11 @@ static void receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, con
 	}
 
 	if(len == 65535) {
-		received_large = true;
+		set_sync_flag(&large_flag, true);
 	}
 
 	if(len == 0) {
-		received_zero = true;
+		set_sync_flag(&small_flag, true);
 	}
 
 	received += len;
@@ -77,6 +77,11 @@ int main(void) {
 	size_t sndbuf_size = 128 * 1024;
 	meshlink_set_channel_sndbuf(mesh_a, channel, sndbuf_size);
 
+	// Check that we can send zero bytes
+
+	assert(meshlink_channel_send(mesh_a, channel, "", 0) == 0);
+	assert(wait_sync_flag(&small_flag, 1));
+
 	// Check that we cannot send more than 65535 bytes without errors
 
 	char data[65535] = "";
@@ -87,10 +92,7 @@ int main(void) {
 	uint16_t framelen = 65535;
 	memcpy(data, &framelen, sizeof(framelen));
 	assert(meshlink_channel_send(mesh_a, channel, data, framelen) == framelen);
-
-	// Check that we can send zero bytes
-
-	assert(meshlink_channel_send(mesh_a, channel, data, 0) == 0);
+	assert(wait_sync_flag(&large_flag, 1));
 
 	// Send randomly sized frames from a to b
 
@@ -117,8 +119,6 @@ int main(void) {
 	// Check that the clients have received all the data we sent
 
 	assert(received == total_len);
-	assert(received_large);
-	assert(received_zero);
 
 	close_meshlink_pair(mesh_a, mesh_b);
 
diff --git a/test/channels-udp-framed.c b/test/channels-udp-framed.c
index 9fb26971..6f3c3cc3 100644
--- a/test/channels-udp-framed.c
+++ b/test/channels-udp-framed.c
@@ -13,10 +13,11 @@
 #include "../src/meshlink.h"
 #include "utils.h"
 
-static bool received_large;
-static bool received_zero;
 static size_t received;
 static struct sync_flag accept_flag;
+static struct sync_flag poll_flag;
+static struct sync_flag small_flag;
+static struct sync_flag large_flag;
 static struct sync_flag close_flag;
 
 static void receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
@@ -34,11 +35,11 @@ static void receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, con
 	}
 
 	if(len == 65535) {
-		received_large = true;
+		set_sync_flag(&large_flag, true);
 	}
 
 	if(len == 0) {
-		received_zero = true;
+		set_sync_flag(&small_flag, true);
 	}
 
 	received += len;
@@ -55,6 +56,11 @@ static bool accept_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint
 	return true;
 }
 
+static void poll_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t len) {
+	meshlink_set_channel_poll_cb(mesh, channel, NULL);
+	set_sync_flag(&poll_flag, len > 0);
+}
+
 int main(void) {
 	meshlink_set_log_cb(NULL, MESHLINK_WARNING, log_cb);
 
@@ -74,6 +80,16 @@ int main(void) {
 	meshlink_channel_t *channel = meshlink_channel_open_ex(mesh_a, b, 1, NULL, NULL, 0, MESHLINK_CHANNEL_UDP | MESHLINK_CHANNEL_FRAMED);
 	assert(channel);
 
+	// Wait for the channel to be fully established
+
+	meshlink_set_channel_poll_cb(mesh_a, channel, poll_cb);
+	assert(wait_sync_flag(&poll_flag, 10));
+
+	// Check that we can send zero bytes, and that it is received
+
+	assert(meshlink_channel_send(mesh_a, channel, "", 0) == 0);
+	assert(wait_sync_flag(&small_flag, 1));
+
 	// Check that we cannot send more than 65535 bytes without errors
 
 	char data[65535] = "";
@@ -84,10 +100,7 @@ int main(void) {
 	uint16_t framelen = 65535;
 	memcpy(data, &framelen, sizeof(framelen));
 	assert(meshlink_channel_send(mesh_a, channel, data, framelen) == framelen);
-
-	// Check that we can send zero bytes
-
-	assert(meshlink_channel_send(mesh_a, channel, data, 0) == 0);
+	assert(wait_sync_flag(&large_flag, 1));
 
 	// Stream packets from a to b for 5 seconds at 40 Mbps (~1 kB * 500 Hz)
 
@@ -113,8 +126,7 @@ int main(void) {
 	// Check that the clients have received (most of) the data
 
 	assert(received <= total_len);
-	assert(received >= total_len / 2);
-	assert(received_zero);
+	assert(received >= total_len / 4 * 3);
 
 	close_meshlink_pair(mesh_a, mesh_b);