Tests: Cleanup: rename test_notification_channel()

[lttng-tools.git] / tests / regression / tools / notification / notification.c

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index e995bb657b934ce0f1c2f44526b802b74b6fe9d7..d3917b4784d0eccb421af7e38474bfd5db255639 100644 (file)
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -613,7 +613,56 @@ end:
        return ret;
 }
 
-static void test_notification_channel(const char *session_name,
+static void test_subscription_twice(const char *session_name,
+               const char *channel_name,
+               const enum lttng_domain_type domain_type)
+{
+       int ret = 0;
+       enum lttng_notification_channel_status nc_status;
+
+       struct lttng_action *action = NULL;
+       struct lttng_notification_channel *notification_channel = NULL;
+       struct lttng_trigger *trigger = NULL;
+
+       struct lttng_condition *condition = NULL;
+
+       ret = register_buffer_usage_notify_trigger(session_name, channel_name,
+                       domain_type, BUFFER_USAGE_TYPE_LOW, 0.99, &condition,
+                       &action, &trigger);
+       if (ret) {
+               fail("Setup error on trigger registration");
+               goto end;
+       }
+
+       /* Begin testing. */
+       notification_channel = lttng_notification_channel_create(
+                       lttng_session_daemon_notification_endpoint);
+       ok(notification_channel, "Notification channel object creation");
+       if (!notification_channel) {
+               goto end;
+       }
+
+       /* Subscribe a valid condition. */
+       nc_status = lttng_notification_channel_subscribe(
+                       notification_channel, condition);
+       ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK,
+                       "Subscribe to condition");
+
+       /* Subscribing again should fail. */
+       nc_status = lttng_notification_channel_subscribe(
+                       notification_channel, condition);
+       ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_ALREADY_SUBSCRIBED,
+                       "Subscribe to a condition for which subscription was already done");
+
+end:
+       lttng_unregister_trigger(trigger);
+       lttng_trigger_destroy(trigger);
+       lttng_notification_channel_destroy(notification_channel);
+       lttng_action_destroy(action);
+       lttng_condition_destroy(condition);
+}
+
+static void test_buffer_usage_notification_channel(const char *session_name,
                const char *channel_name,
                const enum lttng_domain_type domain_type,
                const char **argv)
@@ -662,23 +711,13 @@ static void test_notification_channel(const char *session_name,
        nc_status = lttng_notification_channel_subscribe(
                        notification_channel, low_condition);
        ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK,
-                       "Subscribe to condition");
+                       "Subscribe to low condition");
 
        /* Subscribe a valid high condition */
        nc_status = lttng_notification_channel_subscribe(
                        notification_channel, high_condition);
        ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_OK,
-                       "Subscribe to condition");
-
-       nc_status = lttng_notification_channel_subscribe(
-                       notification_channel, low_condition);
-       ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_ALREADY_SUBSCRIBED,
-                       "Subscribe to a condition for which subscription was already done");
-
-       nc_status = lttng_notification_channel_subscribe(
-                       notification_channel, high_condition);
-       ok(nc_status == LTTNG_NOTIFICATION_CHANNEL_STATUS_ALREADY_SUBSCRIBED,
-                       "Subscribe to a condition for which subscription was already done");
+                       "Subscribe to high condition");
 
        resume_application();
 
@@ -858,9 +897,10 @@ int main(int argc, const char *argv[])
 
        /* Basic error path check. */
        test_invalid_channel_subscription(domain_type);
+       test_subscription_twice(session_name, channel_name, domain_type);
 
-       diag("Test notification channel api for domain %s", domain_type_string);
-       test_notification_channel(session_name, channel_name, domain_type, argv);
+       diag("Test buffer usage notification channel api for domain %s", domain_type_string);
+       test_buffer_usage_notification_channel(session_name, channel_name, domain_type, argv);
 error:
        return exit_status();
 }