JPERF-273: Assert JiraInstance access

atlassian · Sep 11, 2023 · 0b3c72c · 0b3c72c
1 parent 4eea592
commit 0b3c72c
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/...est/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraPlanIT.kt b/...est/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/instance/JiraPlanIT.kt
@@ -76,6 +76,7 @@ class JiraPlanIT {
         val dataCenter = dcPlan.materialize()
 
         // then
+        assertJiraAccessible(dataCenter)
         dataCenter.nodes.forEach { node ->
             val installed = node.installed
             val serverXml = installed
@@ -84,12 +85,7 @@ class JiraPlanIT {
                 .download(Files.createTempFile("downloaded-config", ".xml"))
             assertThat(serverXml.readText()).contains("<Connector port=\"${installed.http.tcp.port}\"")
             assertThat(node.pid).isPositive()
-            val fakeVu = infrastructure.serveSsh()
-            fakeVu.newConnection().use { ssh ->
-                ssh.execute("wget ${dataCenter.address.addressPrivately()}")
-            }
         }
-        dataCenter.address.addressPublicly().toURL().readText()
     }
 
 
@@ -186,6 +182,7 @@ class JiraPlanIT {
         val reports = jiraServerPlan.report().downloadTo(Files.createTempDirectory("jira-server-plan-"))
 
         // then
+        assertJiraAccessible(jiraServer)
         val theNode = jiraServer.nodes.single()
         val serverXml = theNode
             .installed
@@ -216,6 +213,15 @@ class JiraPlanIT {
         }
     }
 
+    private fun assertJiraAccessible(jira: JiraInstance) {
+        val fakeVu = infrastructure.serveSsh()
+        fakeVu.newConnection().use { ssh ->
+            ssh.execute("wget ${jira.address.addressPrivately()}")
+        }
+        val response = jira.address.addressPublicly().toURL().readText()
+        assertThat(response).contains("<body")
+    }
+
     private fun debug(
         jiraServerPlan: JiraInstancePlan,
         e: Exception