diff options
author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2017-01-25 10:50:24 +0100 |
---|---|---|
committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2017-01-26 17:52:52 +0100 |
commit | b035830c7b7d14a42e72dd8cd0249bbf26f2628f (patch) | |
tree | 8d07380199c790f2c49f59168006f6b1dda038b3 /tests | |
parent | b48ef5e2fc174a391a050a00ed03298e5cc688da (diff) | |
download | sonarqube-b035830c7b7d14a42e72dd8cd0249bbf26f2628f.tar.gz sonarqube-b035830c7b7d14a42e72dd8cd0249bbf26f2628f.zip |
SONAR-8684 Cleanup code related to rails
Signed-off-by: Julien Lancelot <julien.lancelot@sonarsource.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java | 2 | ||||
-rw-r--r-- | tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/UpgradeTest.java | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java index 17d3d6a3a58..3ce2ba566db 100644 --- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java +++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java @@ -41,7 +41,7 @@ public class ServerTest extends PerfTestCase { // ES + TOMCAT @Test public void server_startup_and_shutdown() throws Exception { - String defaultWebJavaOptions = "-Xmx768m -XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true -Dfile.encoding=UTF-8 -Djruby.management.enabled=false"; + String defaultWebJavaOptions = "-Xmx768m -XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true -Dfile.encoding=UTF-8"; Orchestrator orchestrator = Orchestrator.builderEnv() .setOrchestratorProperty("javaVersion", "LATEST_RELEASE") .addPlugin("java") diff --git a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/UpgradeTest.java b/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/UpgradeTest.java index 480846415f3..f1f7027bd1a 100644 --- a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/UpgradeTest.java +++ b/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/UpgradeTest.java @@ -232,7 +232,6 @@ public class UpgradeTest { connection.connect(); assertThat(connection.getResponseCode()).as("Fail to load " + path).isEqualTo(HttpURLConnection.HTTP_OK); - // Error HTML pages generated by Ruby on Rails String content = IOUtils.toString(connection.getInputStream()); assertThat(content).as("Fail to load " + path).doesNotContain("something went wrong"); assertThat(content).as("Fail to load " + path).doesNotContain("The page you were looking for doesn't exist"); |