Refactor: test: wrapper for start_lttng_tracing

[lttng-tools.git] / tests / regression / tools / streaming / test_high_throughput_limits

diff --git a/tests/regression/tools/streaming/test_high_throughput_limits b/tests/regression/tools/streaming/test_high_throughput_limits
index 8ed2ce53c8b85651fe77dacbdf55616aa6ac5caa..4a91524860cc994e80cfff5a1215cfc37f1ac3d3 100755 (executable)
--- a/tests/regression/tools/streaming/test_high_throughput_limits
+++ b/tests/regression/tools/streaming/test_high_throughput_limits
@@ -99,8 +99,8 @@ function test_high_throughput
 {
        NETWORK_URI="net://localhost"
        create_lttng_session_with_uri $SESSION_NAME $NETWORK_URI
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        run_apps
        diag "Waiting for applications to end"
        wait
@@ -168,12 +168,14 @@ skip $isroot "Root access is needed to set bandwith limits. Skipping all tests."
 {
 
        # Catch sigint and try to cleanup limits
+       trap interrupt_cleanup SIGTERM
        trap interrupt_cleanup SIGINT
 
        BW_LIMITS=(3200 1600 800 400 200 100 50 25)
        for BW in ${BW_LIMITS[@]};
        do
                diag "Test high-throughput with bandwidth limit set to ${BW}kbits"
+
                set_bw_limit $BW
 
                start_lttng_sessiond