aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2017-10-02 22:46:34 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2017-10-02 22:46:34 +0200
commitf31e2b78f415c4fffbed2233ce0bbc909a1be586 (patch)
treed5508a95226ebe783d0e95b725bef3878acb94cd /tests
parent15e000f0f6c409ced21eb085611a42e3bb4dc4dc (diff)
downloadsonarqube-f31e2b78f415c4fffbed2233ce0bbc909a1be586.tar.gz
sonarqube-f31e2b78f415c4fffbed2233ce0bbc909a1be586.zip
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.
Diffstat (limited to 'tests')
-rw-r--r--tests/src/test/java/org/sonarqube/tests/branch/BranchTest.java6
1 files changed, 3 insertions, 3 deletions
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);