From: Francis Deslauriers Date: Tue, 11 Feb 2020 03:37:03 +0000 (-0500) Subject: Tests: notification: make testcases manage the test app X-Git-Tag: v2.13.0-rc1~300 X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=7676e0d235b5e6254811ecece74159d2c8ca1bcf Tests: notification: make testcases manage the test app Each testcase should resume the application if needed. They must ensure they suspend it before returning. Signed-off-by: Francis Deslauriers Signed-off-by: Jérémie Galarneau Change-Id: I5d4f5f43886af676163ab6190b90181bfb575170 Depends-on: lttng-ust: I5a800fc92e588c2a6a0e26282b0ad5f31c044479 --- diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c index aa0181b6e..97a056b6a 100644 --- a/tests/regression/tools/notification/notification.c +++ b/tests/regression/tools/notification/notification.c @@ -621,6 +621,8 @@ void test_notification_channel(const char *session_name, ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_ALREADY_SUBSCRIBED, "Subscribe to a condition for which subscription was already done"); + resume_application(); + /* Wait for notification to happen */ stop_consumer(argv); lttng_start_tracing(session_name); @@ -721,8 +723,9 @@ void test_notification_channel(const char *session_name, lttng_notification_destroy(notification); notification = NULL; - /* Resume consumer to allow event consumption */ suspend_application(); + + /* Resume consumer to allow event consumption */ lttng_stop_tracing_no_wait(session_name); resume_consumer(argv); wait_data_pending(session_name); @@ -783,6 +786,12 @@ int main(int argc, const char *argv[]) goto error; } + /* + * Test cases are responsible for resuming the app when needed and + * making sure it's suspended when returning. + */ + suspend_application(); + diag("Test trigger for domain %s with buffer_usage_low condition", domain_type_string); test_triggers_buffer_usage_condition(session_name, channel_name, domain_type, LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW); diag("Test trigger for domain %s with buffer_usage_high condition", domain_type_string);