From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Mon, 2 Oct 2017 20:46:34 +0000 (+0200)
Subject: Fix instability of integration tests on Oracle
X-Git-Tag: 6.6-RC1~88
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f31e2b78f415c4fffbed2233ce0bbc909a1be586;p=sonarqube.git

Fix instability of integration tests on Oracle

A SonarQube server is hardly stopped when JVM process shutdowns. JDBC
connections are kept open. These orphan connections are correctly
closed by all databases except Oracle.
---

diff --git a/tests/src/test/java/org/sonarqube/tests/branch/BranchTest.java b/tests/src/test/java/org/sonarqube/tests/branch/BranchTest.java
index 7403df0163e..13dcb0b396f 100644
--- a/tests/src/test/java/org/sonarqube/tests/branch/BranchTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/branch/BranchTest.java
@@ -26,7 +26,7 @@ import org.assertj.core.groups.Tuple;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.tests.Category1Suite;
+import org.sonarqube.tests.Category2Suite;
 import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.Common;
 import org.sonarqube.ws.WsBranches;
@@ -40,7 +40,7 @@ import static util.ItUtils.runProjectAnalysis;
 public class BranchTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
 
   @Rule
   public Tester tester = new Tester(orchestrator).disableOrganizations();
@@ -58,7 +58,7 @@ public class BranchTest {
 
   @Test
   public void navigation_global_return_branches_support_to_false() {
-    WsResponse status =tester.wsClient().wsConnector().call(new GetRequest("api/navigation/global"));
+    WsResponse status = tester.wsClient().wsConnector().call(new GetRequest("api/navigation/global"));
     Map<String, Object> statusMap = ItUtils.jsonToMap(status.content());
 
     assertThat(statusMap.get("branchesEnabled")).isEqualTo(false);