From a89e6c4983ab68b0e2874a38ae58530a94059ff5 Mon Sep 17 00:00:00 2001
From: timpak <timothy.pak@liferay.com>
Date: Thu, 5 Sep 2019 12:21:14 -0700
Subject: [PATCH] LRQA-51899 Check if both Elasticsearch6 and the trial license
 were started successfully

---
 build-test-elasticsearch6.xml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/build-test-elasticsearch6.xml b/build-test-elasticsearch6.xml
index 03dda404432c87..3b5eac99688405 100644
--- a/build-test-elasticsearch6.xml
+++ b/build-test-elasticsearch6.xml
@@ -329,16 +329,6 @@ ${line.separator}CATALINA_OPTS="${CATALINA_OPTS} -Djavax.net.ssl.trustStore=${el
 			</exec>
 
 			<echo>${curl.output}</echo>
-
-			<if>
-				<contains string="${curl.output}" substring="You Know, for Search" />
-				<then>
-					<echo>Elasticsearch started with X-Pack Security.</echo>
-				</then>
-				<else>
-					<fail>Elasticsearch failed to start with X-Pack Security.</fail>
-				</else>
-			</if>
 		</sequential>
 	</macrodef>
 
@@ -353,6 +343,19 @@ ${line.separator}CATALINA_OPTS="${CATALINA_OPTS} -Djavax.net.ssl.trustStore=${el
 			</exec>
 
 			<echo>${curl.output.trial}</echo>
+
+			<if>
+				<and>
+					<contains string="${curl.output}" substring="You Know, for Search" />
+					<contains string="${curl.output.trial}" substring="&quot;trial_was_started&quot; : true" />
+				</and>
+				<then>
+					<echo>Elasticsearch started with X-Pack Security.</echo>
+				</then>
+				<else>
+					<fail>Elasticsearch failed to start with X-Pack Security.</fail>
+				</else>
+			</if>
 		</sequential>
 	</macrodef>