[tests] improve wait for packet implementation to flush logs during wait

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

libknet/tests/api_knet_handle_clear_stats.c

@@ -160,7 +160,7 @@ static void test(void)
 
 	flush_logs(logfds[0], stdout);
 
-	if (wait_for_packet(knet_h, 10, datafd)) {
+	if (wait_for_packet(knet_h, 10, datafd, logfds[0], stdout)) {
 		printf("Error waiting for packet: %s\n", strerror(errno));
 		knet_link_set_enable(knet_h, 1, 0, 0);
 		knet_link_clear_config(knet_h, 1, 0);

libknet/tests/api_knet_send.c

@@ -246,7 +246,7 @@ static void test(uint8_t transport)
 
 	flush_logs(logfds[0], stdout);
 
-	if (wait_for_packet(knet_h, 10, datafd)) {
+	if (wait_for_packet(knet_h, 10, datafd, logfds[0], stdout)) {
 		printf("Error waiting for packet: %s\n", strerror(errno));
 		knet_link_set_enable(knet_h, 1, 0, 0);
 		knet_link_clear_config(knet_h, 1, 0);

libknet/tests/api_knet_send_compress.c

@@ -170,7 +170,7 @@ static void test(const char *model)
 
 	flush_logs(logfds[0], stdout);
 
-	if (wait_for_packet(knet_h, 10, datafd)) {
+	if (wait_for_packet(knet_h, 10, datafd, logfds[0], stdout)) {
 		printf("Error waiting for packet: %s\n", strerror(errno));
 		knet_link_set_enable(knet_h, 1, 0, 0);
 		knet_link_clear_config(knet_h, 1, 0);

libknet/tests/api_knet_send_crypto.c

@@ -171,7 +171,7 @@ static void test(const char *model)
 
 	flush_logs(logfds[0], stdout);
 
-	if (wait_for_packet(knet_h, 10, datafd)) {
+	if (wait_for_packet(knet_h, 10, datafd, logfds[0], stdout)) {
 		printf("Error waiting for packet: %s\n", strerror(errno));
 		knet_link_set_enable(knet_h, 1, 0, 0);
 		knet_link_clear_config(knet_h, 1, 0);

libknet/tests/api_knet_send_loopback.c

@@ -251,7 +251,7 @@ static void test(void)
 
 	flush_logs(logfds[0], stdout);
 
-	if (wait_for_packet(knet_h, 10, datafd)) {
+	if (wait_for_packet(knet_h, 10, datafd, logfds[0], stdout)) {
 		printf("Error waiting for packet: %s\n", strerror(errno));
 		knet_link_set_enable(knet_h, 1, 0, 0);
 		knet_link_clear_config(knet_h, 1, 0);
@@ -352,7 +352,7 @@ static void test(void)
 
 	flush_logs(logfds[0], stdout);
 
-	if (wait_for_packet(knet_h, 10, datafd)) {
+	if (wait_for_packet(knet_h, 10, datafd, logfds[0], stdout)) {
 		printf("Error waiting for packet: %s\n", strerror(errno));
 		knet_link_set_enable(knet_h, 1, 0, 0);
 		knet_link_clear_config(knet_h, 1, 0);

libknet/tests/test-common.c

@@ -485,7 +485,7 @@ int wait_for_host(knet_handle_t knet_h, uint16_t host_id, int seconds, int logfd
 	return -1;
 }
 
-int wait_for_packet(knet_handle_t knet_h, int seconds, int datafd)
+int wait_for_packet(knet_handle_t knet_h, int seconds, int datafd, int logfd, FILE *std)
 {
 	fd_set rfds;
 	struct timeval tv;
@@ -500,7 +500,7 @@ int wait_for_packet(knet_handle_t knet_h, int seconds, int datafd)
 	FD_ZERO(&rfds);
 	FD_SET(datafd, &rfds);
 
-	tv.tv_sec = seconds;
+	tv.tv_sec = 1;
 	tv.tv_usec = 0;
 
 	err = select(datafd+1, &rfds, NULL, NULL, &tv);
@@ -509,7 +509,8 @@ int wait_for_packet(knet_handle_t knet_h, int seconds, int datafd)
 	 * pick an arbitrary 10 times loop (multiplied by waiting seconds)
 	 * before failing.
 	 */
-	if ((!err) && (i < 10)) {
+	if ((!err) && (i < seconds)) {
+		flush_logs(logfd, std);
 		i++;
 		goto try_again;
 	}

libknet/tests/test-common.h

@@ -70,6 +70,6 @@ int stop_logthread(void);
 int make_local_sockaddr(struct sockaddr_storage *lo, uint16_t offset);
 int make_local_sockaddr6(struct sockaddr_storage *lo, uint16_t offset);
 int wait_for_host(knet_handle_t knet_h, uint16_t host_id, int seconds, int logfd, FILE *std);
-int wait_for_packet(knet_handle_t knet_h, int seconds, int datafd);
+int wait_for_packet(knet_handle_t knet_h, int seconds, int datafd, int logfd, FILE *std);
 
 #endif