JiraInstanceManagerRest.groovy

* Minor bugfixes JiraInstanceManagerRestSpec.groovy * Made sure JiraLocalFailedSpockTest.groovy is only run inside of JIRA
eficode · Apr 3, 2024 · 2a7ba90 · 2a7ba90
1 parent 0c58fba
commit 2a7ba90
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/main/groovy/com/eficode/atlassian/jiraInstanceManager/JiraInstanceManagerRest.groovy b/src/main/groovy/com/eficode/atlassian/jiraInstanceManager/JiraInstanceManagerRest.groovy
@@ -1007,7 +1007,7 @@ final class JiraInstanceManagerRest {
      * @param timeOutS If this timeout is breached false will be returned
      * @return true if JIRA got responsive before timeout was reached
      */
-    boolean waitForJiraToBeResponsive(long timeOutS = 90) {
+    boolean waitForJiraToBeResponsive(long timeOutS = 160) {
 
 
         HttpResponse<Map> response = null
@@ -1801,8 +1801,8 @@ final class JiraInstanceManagerRest {
             log.warn("Error getting response after executing ScriptRunner Script, got body:" + scriptResponse.body?.toPrettyString())
         }
 
-        ArrayList<String> logRows = scriptResponseJson.snapshot?.log?.split("\n")
-        ArrayList<String> errorRows = scriptResponseJson.errorMessages
+        ArrayList<String> logRows = scriptResponseJson?.snapshot?.log?.split("\n") ?: []
+        ArrayList<String> errorRows = scriptResponseJson?.errorMessages ?: [] as ArrayList<String>
 
         errorRows.each { log.info(it) }
         logRows.each { log.info(it) }

diff --git a/src/test/groovy/com/eficode/atlassian/jiraInstanceManager/JiraInstanceManagerRestSpec.groovy b/src/test/groovy/com/eficode/atlassian/jiraInstanceManager/JiraInstanceManagerRestSpec.groovy
@@ -60,6 +60,7 @@ class JiraInstanceManagerRestSpec extends Specification {
         Unirest.config().defaultBaseUrl(baseUrl).setDefaultBasicAuth(restAdmin, restPw)
 
 
+
         jsmDep.setJiraLicense(jsmLicense)
         jsmDep.appsToInstall.put(MarketplaceApp.getScriptRunnerVersion(baseSrVersion).getDownloadUrl(), srLicense)
 
@@ -405,7 +406,9 @@ class JiraInstanceManagerRestSpec extends Specification {
 
         when: "Adding a failing test to the main package"
         log.info("Uploading failing test class")
-        assert jira.updateScriptrunnerFile(new File("src/test/groovy/com/eficode/atlassian/jiraInstanceManager/jiraLocalScripts/JiraLocalFailedSpockTest.groovy"), "com/eficode/atlassian/jiraInstanceManager/jiraLocalScripts/JiraLocalFailedSpockTest.groovy"): "Error updating failing test file"
+        String failingTestBody = new File("src/test/groovy/com/eficode/atlassian/jiraInstanceManager/jiraLocalScripts/JiraLocalFailedSpockTest.groovy").text
+        failingTestBody = failingTestBody.replaceAll("@Ignore.*", "")
+        assert jira.updateScriptrunnerFile(failingTestBody, "com/eficode/atlassian/jiraInstanceManager/jiraLocalScripts/JiraLocalFailedSpockTest.groovy"): "Error updating failing test file"
         sleep(2000) //SR needs sometime to pick up the diff
 
         log.info("\tRunning the same package, class and method tests")
@@ -498,7 +501,9 @@ class JiraInstanceManagerRestSpec extends Specification {
 
         when: "Adding a failing test to the main package"
         log.info("Uploading failing test class")
-        assert jira.updateScriptrunnerFile(new File("src/test/groovy/com/eficode/atlassian/jiraInstanceManager/jiraLocalScripts/JiraLocalFailedSpockTest.groovy"), "com/eficode/atlassian/jiraInstanceManager/jiraLocalScripts/JiraLocalFailedSpockTest.groovy"): "Error updating failing test file"
+        String failingTestBody = new File("src/test/groovy/com/eficode/atlassian/jiraInstanceManager/jiraLocalScripts/JiraLocalFailedSpockTest.groovy").text
+        failingTestBody = failingTestBody.replaceAll("@Ignore.*", "")
+        assert jira.updateScriptrunnerFile(failingTestBody, "com/eficode/atlassian/jiraInstanceManager/jiraLocalScripts/JiraLocalFailedSpockTest.groovy"): "Error updating failing test file"
         sleep(1500)//Wait for SR to detect file changes
 
         log.info("\tRunning the same package, class and method tests")

diff --git a/...om/eficode/atlassian/jiraInstanceManager/jiraLocalScripts/JiraLocalFailedSpockTest.groovy b/...om/eficode/atlassian/jiraInstanceManager/jiraLocalScripts/JiraLocalFailedSpockTest.groovy
@@ -3,9 +3,11 @@ package com.eficode.atlassian.jiraInstanceManager.jiraLocalScripts
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import spock.lang.Ignore
 import spock.lang.Shared
 import spock.lang.Specification
 
+@Ignore("Only run inside of JIRA container")
 class JiraLocalFailedSpockTest extends Specification {
 
     @Shared
@@ -26,6 +28,4 @@ class JiraLocalFailedSpockTest extends Specification {
     }
 
 
-
-
 }