From 272ba89a5ee1a45f1fcdd7b46139cd0cefd2150d Mon Sep 17 00:00:00 2001
From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Thu, 5 Nov 2015 16:42:50 -0500
Subject: [PATCH] Test: expose session url bug on load with multiple domains
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

When loading a live session with multiple domain lttng return code
21 which corresponds to the URL being already set.

Refs #973

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 .../tools/save-load/load-42-complex.lttng         | 15 +++++++++++++++
 tests/regression/tools/save-load/test_load        |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/tests/regression/tools/save-load/load-42-complex.lttng b/tests/regression/tools/save-load/load-42-complex.lttng
index 749359bfe..399d873c1 100644
--- a/tests/regression/tools/save-load/load-42-complex.lttng
+++ b/tests/regression/tools/save-load/load-42-complex.lttng
@@ -96,6 +96,21 @@
 					</channel>
 				</channels>
 			</domain>
+			<domain>
+				<type>JUL</type>
+				<buffer_type>PER_UID</buffer_type>
+				<channels/>
+			</domain>
+			<domain>
+				<type>LOG4J</type>
+				<buffer_type>PER_UID</buffer_type>
+				<channels/>
+			</domain>
+			<domain>
+				<type>PYTHON</type>
+				<buffer_type>PER_UID</buffer_type>
+				<channels/>
+			</domain>
 		</domains>
 		<started>false</started>
 		<attributes>
diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load
index 11563985c..4d7918578 100755
--- a/tests/regression/tools/save-load/test_load
+++ b/tests/regression/tools/save-load/test_load
@@ -74,7 +74,7 @@ function test_complex_load()
 		break;
 	fi
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN --mi XML list $sess -c chan2 > $mi_output_file
-	mi_result=$($CURDIR/../mi/extract_xml $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:channels/lttng:channel[lttng:name='chan2']/lttng:events/lttng:event[lttng:name='uevent_disabled']/lttng:enabled/text()")
+	mi_result=$($CURDIR/../mi/extract_xml $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain[lttng:type='UST']/lttng:channels/lttng:channel[lttng:name='chan2']/lttng:events/lttng:event[lttng:name='uevent_disabled']/lttng:enabled/text()")
 	if [[ $mi_result = "false" ]]; then
 	    ok 0 "Disabled event is loaded in disabled state"
 	else
-- 
2.34.1