X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftrigger%2Ftest_remove_trigger_cli;h=5f3dffc4e1471855c4596437a16748bf96940908;hb=50ad08620ff49e3c27e6eb3fea5151e744ae13ec;hp=582cce7ef3fe4958aef349d455b145354601d4ae;hpb=90aa04a116a8be510b9d256b47de6bbb4144fb8b;p=lttng-tools.git

diff --git a/tests/regression/tools/trigger/test_remove_trigger_cli b/tests/regression/tools/trigger/test_remove_trigger_cli
index 582cce7ef..5f3dffc4e 100755
--- a/tests/regression/tools/trigger/test_remove_trigger_cli
+++ b/tests/regression/tools/trigger/test_remove_trigger_cli
@@ -51,13 +51,13 @@ function list_triggers ()
 
 function remove_trigger ()
 {
-	local id="$1"
-	local test_name="remove trigger ${id}"
+	local name="$1"
+	local test_name="remove trigger ${name}"
 
-	"${FULL_LTTNG_BIN}" remove-trigger "${id}" > "${tmp_stdout}" 2> "${tmp_stderr}"
+	"${FULL_LTTNG_BIN}" remove-trigger "${name}" > "${tmp_stdout}" 2> "${tmp_stderr}"
 	ok $? "${test_name}: exit code is 0"
 
-	diff -u <(echo "Removed trigger \`${id}\`.") "${tmp_stdout}"
+	diff -u <(echo "Removed trigger \`${name}\`.") "${tmp_stdout}"
 	ok $? "${test_name}: expected stdout"
 
 	diff -u /dev/null "${tmp_stderr}"
@@ -68,37 +68,40 @@ function remove_trigger ()
 start_lttng_sessiond_notap
 
 # Add a few triggers
-lttng_add_trigger_ok "ABC" --condition on-event aaa -u --filter 'p == 2' --action notify
-lttng_add_trigger_ok "DEF" --condition on-event -u -a --action notify
+lttng_add_trigger_ok "ABC" --condition event-rule-matches --name=aaa -u --filter 'p == 2' --action notify
+lttng_add_trigger_ok "DEF" --condition event-rule-matches -u --action notify
 
 cat > "${tmp_expected_stdout}" <<- EOF
-- id: ABC
+- name: ABC
   user id: ${uid}
   condition: event rule hit
     rule: aaa (type: tracepoint, domain: ust, filter: p == 2)
-    tracer notifications discarded: 0
   actions:
     notify
-- id: DEF
+      errors: none
+  errors: none
+- name: DEF
   user id: ${uid}
   condition: event rule hit
     rule: * (type: tracepoint, domain: ust)
-    tracer notifications discarded: 0
   actions:
     notify
+      errors: none
+  errors: none
 EOF
 list_triggers "two triggers left" "${tmp_expected_stdout}"
 
 remove_trigger "ABC"
 
 cat > "${tmp_expected_stdout}" <<- EOF
-- id: DEF
+- name: DEF
   user id: ${uid}
   condition: event rule hit
     rule: * (type: tracepoint, domain: ust)
-    tracer notifications discarded: 0
   actions:
     notify
+      errors: none
+  errors: none
 EOF
 list_triggers "one trigger left" "${tmp_expected_stdout}"