tmf: lttngControl: Separate STDERR from output and create errorOutput

Refactoring of current function to adjust to change.
Modifications to test scenarios to support new error output

Change-Id: I457aeed7ae6aba1ce880339c5a9b7f55c6a0e232
Signed-off-by: Jonathan Rajotte Julien <jonathan.rajotte-julien@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/31228
Tested-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>

1 files changed, 32 insertions, 0 deletions

diff --git a/lttng/org.eclipse.linuxtools.lttng2.control.ui.tests/testfiles/LTTngServiceTest.cfg b/lttng/org.eclipse.linuxtools.lttng2.control.ui.tests/testfiles/LTTngServiceTest.cfg
index 22a69e988c..9d519f92eb 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.control.ui.tests/testfiles/LTTngServiceTest.cfg
+++ b/lttng/org.eclipse.linuxtools.lttng2.control.ui.tests/testfiles/LTTngServiceTest.cfg
@@ -21,7 +21,9 @@ lttng list
 1
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
+<COMMAND_ERROR_OUTPUT>
 Command not found
+</COMMAND_ERROR_OUTPUT>
 </COMMAND_OUTPUT>
 </SCENARIO>
 
@@ -151,7 +153,9 @@ lttng list test
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
 Session test not found
+<COMMAND_ERROR_OUTPUT>
 Error: Session name not found
+</COMMAND_ERROR_OUTPUT>
 </COMMAND_OUTPUT>
 </SCENARIO>
 
@@ -169,8 +173,10 @@ lttng -vvv  list test
 <COMMAND_OUTPUT>
 DEBUG2: Session name: test [in cmd_list() at commands/list.c:618]
 DEBUG1: Session count 1 [in list_sessions() at commands/list.c:485]
+<COMMAND_ERROR_OUTPUT>
 Error: Session 'test' not found
 Error: Command error
+</COMMAND_ERROR_OUTPUT>
 DEBUG1: Clean exit [in clean_exit() at lttng.c:165]
 </COMMAND_OUTPUT>
 </SCENARIO>
@@ -319,7 +325,9 @@ lttng list -k
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
 Spawning session daemon
+<COMMAND_ERROR_OUTPUT>
 Error: Unable to list kernel events
+</COMMAND_ERROR_OUTPUT>
 </COMMAND_OUTPUT>
 </SCENARIO>
 
@@ -335,7 +343,9 @@ lttng list -k
 1
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
+<COMMAND_ERROR_OUTPUT>
 Error: Unable to list kernel events
+</COMMAND_ERROR_OUTPUT>
 </COMMAND_OUTPUT>
 </SCENARIO>
 
@@ -353,7 +363,9 @@ lttng -vvv  list -k
 <COMMAND_OUTPUT>
 DEBUG2: Session name: (null) [in cmd_list() at commands/list.c:618]
 DEBUG1: Getting kernel tracing events [in list_kernel_events() at commands/list.c:309]
+<COMMAND_ERROR_OUTPUT>
 Error: Unable to list kernel events
+</COMMAND_ERROR_OUTPUT>
 DEBUG1: Clean exit [in clean_exit() at lttng.c:165]
 </COMMAND_OUTPUT>
 </SCENARIO>
@@ -435,8 +447,10 @@ lttng list -u -f
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
 Spawning a session daemon
+<COMMAND_ERROR_OUTPUT>
 Error: Unable to list UST events: Listing UST events failed
 Error: Command Error
+</COMMAND_ERROR_OUTPUT>
 </COMMAND_OUTPUT>
 </SCENARIO>
 
@@ -452,8 +466,10 @@ lttng list -u -f
 1
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
+<COMMAND_ERROR_OUTPUT>
 Error: Unable to list UST events: Listing UST events failed
 Error: Command Error
+</COMMAND_ERROR_OUTPUT>
 </COMMAND_OUTPUT>
 </SCENARIO>
 
@@ -472,8 +488,10 @@ lttng -vvv  list -u -f
 DEBUG2: Session name: (null) [in cmd_list() at commands/list.c:618]
 DEBUG1: Getting kernel tracing events [in list_kernel_events() at commands/list.c:309]
 Spawning a session daemon
+<COMMAND_ERROR_OUTPUT>
 Error: Unable to list UST events: Listing UST events failed
 Error: Command Error
+</COMMAND_ERROR_OUTPUT>
 DEBUG1: Clean exit [in clean_exit() at lttng.c:165]
 </COMMAND_OUTPUT>
 </SCENARIO>
@@ -559,7 +577,9 @@ lttng create alreadyExist
 1
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
+<COMMAND_ERROR_OUTPUT>
 Error: Session name already exist
+</COMMAND_ERROR_OUTPUT>
 </COMMAND_OUTPUT>
 
 <COMMAND_INPUT>
@@ -1271,7 +1291,9 @@ lttng snapshot list-output  -s blabla
 1
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
+<COMMAND_ERROR_OUTPUT>
 Error: Session name not found
+</COMMAND_ERROR_OUTPUT>
 </COMMAND_OUTPUT>
 #------------------------------------------------------------------------------
 #next is not an error case but good to be tested
@@ -1293,7 +1315,9 @@ lttng snapshot record  -s blabla
 1
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
+<COMMAND_ERROR_OUTPUT>
     Error: Session name not found
+</COMMAND_ERROR_OUTPUT>
 </COMMAND_OUTPUT>
 #------------------------------------------------------------------------------
 <COMMAND_INPUT>
@@ -1303,7 +1327,9 @@ lttng snapshot record  -s mysession
 1
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
+<COMMAND_ERROR_OUTPUT>
     Error: Session needs to be started once
+</COMMAND_ERROR_OUTPUT>
 </COMMAND_OUTPUT>
 
 </SCENARIO>
@@ -1361,8 +1387,10 @@ lttng create mysession --live --snapshot
 1
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
+<COMMAND_ERROR_OUTPUT>
 Error: Snapshot and live modes are mutually exclusive.
 Error: Command error
+</COMMAND_ERROR_OUTPUT>
 </COMMAND_OUTPUT>
 #------------------------------------------------------------------------------
 <COMMAND_INPUT>
@@ -1372,9 +1400,11 @@ lttng create mysession --live -U blah
 1
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
+<COMMAND_ERROR_OUTPUT>
 Error: URI parse unknown protocol blah
 Error: Unable to parse the URL blah
 Error: Invalid parameter
+</COMMAND_ERROR_OUTPUT>
 </COMMAND_OUTPUT>
 #------------------------------------------------------------------------------
 <COMMAND_INPUT>
@@ -1384,7 +1414,9 @@ lttng create mysession --live -C net://127.0.0.1
 1
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
+<COMMAND_ERROR_OUTPUT>
 Error: You need both control and data URL.
 Error: Command error
+</COMMAND_ERROR_OUTPUT>
 </COMMAND_OUTPUT>
 </SCENARIO>
\ No newline at end of file