X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=364d41895bb78531f61b20a1842bfe4a02960680;hp=535a71fce7fd8b5cbda2fa9a4086866b4d372007;hb=67c93c15b77fa2089110ade9d493b17df6e90fc2;hpb=f12eb9c1ceb619db54be0842323a32cda12651cd

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index 535a71fce..364d41895 100644
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -601,7 +601,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	lttng_start_tracing(session_name);
 
 	/* Wait for high notification */
-	nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	do {
+		nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	} while (nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INTERRUPTED);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK
 			&& notification
 			&& lttng_condition_get_type(lttng_notification_get_condition(notification)) == LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH,
@@ -625,7 +627,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	nc_status = lttng_notification_channel_subscribe(notification_channel, low_condition);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK, "subscribe with pending notification");
 
-	nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	do {
+		nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	} while (nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INTERRUPTED);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK
 			&& notification
 			&& lttng_condition_get_type(lttng_notification_get_condition(notification)) == LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW,
@@ -638,7 +642,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	resume_application();
 	lttng_start_tracing(session_name);
 
-	nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	do {
+		nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	} while (nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INTERRUPTED);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification &&
 			lttng_condition_get_type(lttng_notification_get_condition(notification)) == LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH,
 			"High notification received after intermediary communication");
@@ -650,7 +656,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	resume_consumer(argv);
 	wait_data_pending(session_name);
 
-	nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	do {
+		nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	} while (nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INTERRUPTED);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification &&
 			lttng_condition_get_type(lttng_notification_get_condition(notification)) == LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW,
 			"Low notification received after re-subscription");
@@ -662,7 +670,9 @@ void test_notification_channel(const char *session_name, const char *channel_nam
 	/* Stop consumer to force a high notification */
 	lttng_start_tracing(session_name);
 
-	nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	do {
+		nc_status = lttng_notification_channel_get_next_notification(notification_channel, &notification);
+	} while (nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_INTERRUPTED);
 	ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK && notification &&
 			lttng_condition_get_type(lttng_notification_get_condition(notification)) == LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH,
 			"High notification");