lttng {add,list,remove}-trigger: rename user id to owner uid

[lttng-tools.git] / tests / regression / tools / trigger / test_list_triggers_cli

diff --git a/tests/regression/tools/trigger/test_list_triggers_cli b/tests/regression/tools/trigger/test_list_triggers_cli
index 30b636969c6e2135a683be02852932868e101667..31ba7b366c114d4dd2c1febbf9da555233342302 100755 (executable)
--- a/tests/regression/tools/trigger/test_list_triggers_cli
+++ b/tests/regression/tools/trigger/test_list_triggers_cli
@@ -23,8 +23,7 @@ TESTDIR="$CURDIR/../../.."
 # shellcheck source=../../../utils/utils.sh
 source "$TESTDIR/utils/utils.sh"
 
-
-NUM_TESTS=82
+NUM_TESTS=84
 
 FULL_LTTNG_BIN="${TESTDIR}/../src/bin/lttng/${LTTNG_BIN}"
 
@@ -74,7 +73,7 @@ test_top_level_options ()
 
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: hello
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: test-name (type: tracepoint, domain: ust)
          actions:
@@ -95,8 +94,9 @@ test_on_event_tracepoint ()
        lttng_add_trigger_ok "C" --condition event-rule-matches --domain=user --action notify
        lttng_add_trigger_ok "A" --condition event-rule-matches --name=aaa --domain=user --filter 'p == 2' --action notify
        lttng_add_trigger_ok "D" --condition event-rule-matches --name='hello*' --domain=user -x 'hello2,hello3,hello4' --action notify
-       lttng_add_trigger_ok "B" --condition event-rule-matches --domain=user --name=gerboise --loglevel INFO --action notify
-       lttng_add_trigger_ok "E" --condition event-rule-matches --domain=user --name=lemming --loglevel-only WARNING --action notify
+       lttng_add_trigger_ok "B" --condition event-rule-matches --domain=user --name=gerboise --log-level INFO.. --action notify
+       lttng_add_trigger_ok "E" --condition event-rule-matches --domain=user --name=lemming --log-level WARNING --action notify
+       lttng_add_trigger_ok "J" --condition event-rule-matches --domain=user --name=lemming --log-level .. --action notify
        lttng_add_trigger_ok "F" --condition event-rule-matches --domain=user --name=capture-payload-field --capture a --action notify
        lttng_add_trigger_ok "G" --condition event-rule-matches --domain=user --name=capture-array --capture 'a[2]' --capture '$ctx.tourlou[18]' --action notify
        lttng_add_trigger_ok "H" --condition event-rule-matches --domain=user --name=capture-chan-ctx --capture '$ctx.vpid' --action notify
@@ -104,7 +104,7 @@ test_on_event_tracepoint ()
 
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: A
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: aaa (type: tracepoint, domain: ust, filter: p == 2)
          actions:
@@ -112,7 +112,7 @@ test_on_event_tracepoint ()
              errors: none
          errors: none
        - name: B
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: gerboise (type: tracepoint, domain: ust, log level at least INFO)
          actions:
@@ -120,7 +120,7 @@ test_on_event_tracepoint ()
              errors: none
          errors: none
        - name: C
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: * (type: tracepoint, domain: ust)
          actions:
@@ -128,7 +128,7 @@ test_on_event_tracepoint ()
              errors: none
          errors: none
        - name: D
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: hello* (type: tracepoint, domain: ust, exclusions: hello2,hello3,hello4)
          actions:
@@ -136,7 +136,7 @@ test_on_event_tracepoint ()
              errors: none
          errors: none
        - name: E
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: lemming (type: tracepoint, domain: ust, log level is WARNING)
          actions:
@@ -144,7 +144,7 @@ test_on_event_tracepoint ()
              errors: none
          errors: none
        - name: F
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: capture-payload-field (type: tracepoint, domain: ust)
            captures:
@@ -154,7 +154,7 @@ test_on_event_tracepoint ()
              errors: none
          errors: none
        - name: G
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: capture-array (type: tracepoint, domain: ust)
            captures:
@@ -165,7 +165,7 @@ test_on_event_tracepoint ()
              errors: none
          errors: none
        - name: H
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: capture-chan-ctx (type: tracepoint, domain: ust)
            captures:
@@ -175,7 +175,7 @@ test_on_event_tracepoint ()
              errors: none
          errors: none
        - name: I
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: capture-app-ctx (type: tracepoint, domain: ust)
            captures:
@@ -184,6 +184,14 @@ test_on_event_tracepoint ()
            notify
              errors: none
          errors: none
+       - name: J
+         owner uid: ${uid}
+         condition: event rule hit
+           rule: lemming (type: tracepoint, domain: ust)
+         actions:
+           notify
+             errors: none
+         errors: none
        EOF
 
        list_triggers_matches_ok "event-rule-matches, tracepoint event rule" "${tmp_expected_stdout}"
@@ -197,6 +205,7 @@ test_on_event_tracepoint ()
        lttng_remove_trigger_ok "G"
        lttng_remove_trigger_ok "H"
        lttng_remove_trigger_ok "I"
+       lttng_remove_trigger_ok "J"
 }
 
 test_on_event_probe ()
@@ -228,7 +237,7 @@ test_on_event_probe ()
 
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: T0
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: my_channel_enable (type: probe, location: lttng_channel_enable)
          actions:
@@ -236,7 +245,7 @@ test_on_event_probe ()
              errors: none
          errors: none
        - name: T1
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: my_channel_enable (type: probe, location: ${base_symbol}+${offset_hex})
          actions:
@@ -244,7 +253,7 @@ test_on_event_probe ()
              errors: none
          errors: none
        - name: T2
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: my_channel_enable (type: probe, location: 0x${channel_enable_addr})
          actions:
@@ -270,7 +279,7 @@ test_on_event_userspace_probe_elf ()
 
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: T0
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: ma-probe-elf (type: userspace probe, location type: ELF, location: ${uprobe_elf_binary}:${elf_function_name})
          actions:
@@ -318,7 +327,7 @@ test_on_event_syscall ()
 
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: T0
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: open (type: syscall)
          actions:
@@ -326,7 +335,7 @@ test_on_event_syscall ()
              errors: none
          errors: none
        - name: T1
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: ptrace (type: syscall, filter: a > 2)
          actions:
@@ -358,7 +367,7 @@ test_snapshot_action ()
 
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: T0
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: some-event (type: tracepoint, domain: ust)
          actions:
@@ -366,7 +375,7 @@ test_snapshot_action ()
              errors: none
          errors: none
        - name: T1
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: some-event (type: tracepoint, domain: ust)
          actions:
@@ -374,7 +383,7 @@ test_snapshot_action ()
              errors: none
          errors: none
        - name: T2
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: some-event (type: tracepoint, domain: ust)
          actions:
@@ -382,7 +391,7 @@ test_snapshot_action ()
              errors: none
          errors: none
        - name: T3
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: some-event (type: tracepoint, domain: ust)
          actions:
@@ -390,7 +399,7 @@ test_snapshot_action ()
              errors: none
          errors: none
        - name: T4
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: some-event (type: tracepoint, domain: ust)
          actions:
@@ -398,7 +407,7 @@ test_snapshot_action ()
              errors: none
          errors: none
        - name: T5
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: some-event (type: tracepoint, domain: ust)
          actions:
@@ -406,7 +415,7 @@ test_snapshot_action ()
              errors: none
          errors: none
        - name: T6
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: some-event (type: tracepoint, domain: ust)
          actions:
@@ -414,7 +423,7 @@ test_snapshot_action ()
              errors: none
          errors: none
        - name: T7
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: some-event (type: tracepoint, domain: ust)
          actions:
@@ -422,7 +431,7 @@ test_snapshot_action ()
              errors: none
          errors: none
        - name: T8
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: some-event (type: tracepoint, domain: ust)
          actions:
@@ -430,7 +439,7 @@ test_snapshot_action ()
              errors: none
          errors: none
        - name: T9
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: some-event (type: tracepoint, domain: ust)
          actions:
@@ -460,7 +469,7 @@ test_notify_action ()
 
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: T0
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: some-event (type: tracepoint, domain: ust)
          actions:
@@ -468,7 +477,7 @@ test_notify_action ()
              errors: none
          errors: none
        - name: T1
-         user id: ${uid}
+         owner uid: ${uid}
          condition: event rule hit
            rule: some-event (type: tracepoint, domain: ust)
          actions: