Repository: activemq-artemis Updated Branches: refs/heads/1.x bc8c83172 -> 1ed6ace94
NO-JIRA: speeding up ArtemisTest Before this change tests could take a long time on certain laptops. We don't need to perform the auto-tune journal for these tests. (cherry-picked from 235b9082d87e465f54d550c8875d7cbefcc3a527) Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1ed6ace9 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1ed6ace9 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1ed6ace9 Branch: refs/heads/1.x Commit: 1ed6ace94152558287fbb9ff34ae3309f9286d1c Parents: bc8c831 Author: Clebert Suconic <[email protected]> Authored: Tue Feb 7 11:26:35 2017 -0500 Committer: Clebert Suconic <[email protected]> Committed: Thu Feb 9 10:05:58 2017 -0500 ---------------------------------------------------------------------- .../apache/activemq/cli/test/ArtemisTest.java | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1ed6ace9/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java index 7cd20be..3ec2bd4 100644 --- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java +++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java @@ -149,8 +149,8 @@ public class ArtemisTest { @Test public void testSync() throws Exception { - int writes = 20; - int tries = 10; + int writes = 2; + int tries = 5; long totalAvg = SyncCalculation.syncTest(temporaryFolder.getRoot(), 4096, writes, tries, true, true, JournalType.NIO); System.out.println(); System.out.println("TotalAvg = " + totalAvg); @@ -164,7 +164,7 @@ public class ArtemisTest { public void testSimpleCreate() throws Exception { //instance1: default using http File instance1 = new File(temporaryFolder.getRoot(), "instance1"); - Artemis.main("create", instance1.getAbsolutePath(), "--silent", "--no-fsync"); + Artemis.main("create", instance1.getAbsolutePath(), "--silent", "--no-fsync", "--no-autotune"); } @@ -173,7 +173,7 @@ public class ArtemisTest { try { //instance1: default using http File instance1 = new File(temporaryFolder.getRoot(), "instance1"); - Artemis.main("create", instance1.getAbsolutePath(), "--silent", "--mapped"); + Artemis.main("create", instance1.getAbsolutePath(), "--silent", "--mapped", "--no-autotune"); } catch (Throwable e) { e.printStackTrace(); throw e; @@ -186,7 +186,7 @@ public class ArtemisTest { Run.setEmbedded(true); //instance1: default using http File instance1 = new File(temporaryFolder.getRoot(), "instance1"); - Artemis.main("create", instance1.getAbsolutePath(), "--silent", "--no-fsync"); + Artemis.main("create", instance1.getAbsolutePath(), "--silent", "--no-fsync", "--no-autotune"); File bootstrapFile = new File(new File(instance1, "etc"), "bootstrap.xml"); assertTrue(bootstrapFile.exists()); Document config = parseXml(bootstrapFile); @@ -205,7 +205,7 @@ public class ArtemisTest { //instance2: https File instance2 = new File(temporaryFolder.getRoot(), "instance2"); - Artemis.main("create", instance2.getAbsolutePath(), "--silent", "--ssl-key", "etc/keystore", "--ssl-key-password", "password1", "--no-fsync"); + Artemis.main("create", instance2.getAbsolutePath(), "--silent", "--ssl-key", "etc/keystore", "--ssl-key-password", "password1", "--no-fsync", "--no-autotune"); bootstrapFile = new File(new File(instance2, "etc"), "bootstrap.xml"); assertTrue(bootstrapFile.exists()); config = parseXml(bootstrapFile); @@ -226,7 +226,7 @@ public class ArtemisTest { //instance3: https with clientAuth File instance3 = new File(temporaryFolder.getRoot(), "instance3"); - Artemis.main("create", instance3.getAbsolutePath(), "--silent", "--ssl-key", "etc/keystore", "--ssl-key-password", "password1", "--use-client-auth", "--ssl-trust", "etc/truststore", "--ssl-trust-password", "password2", "--no-fsync"); + Artemis.main("create", instance3.getAbsolutePath(), "--silent", "--ssl-key", "etc/keystore", "--ssl-key-password", "password1", "--use-client-auth", "--ssl-trust", "etc/truststore", "--ssl-trust-password", "password2", "--no-fsync", "--no-autotune"); bootstrapFile = new File(new File(instance3, "etc"), "bootstrap.xml"); assertTrue(bootstrapFile.exists()); @@ -259,7 +259,7 @@ public class ArtemisTest { Run.setEmbedded(true); File instance1 = new File(temporaryFolder.getRoot(), "instance_user"); System.setProperty("java.security.auth.login.config", instance1.getAbsolutePath() + "/etc/login.config"); - Artemis.main("create", instance1.getAbsolutePath(), "--silent"); + Artemis.main("create", instance1.getAbsolutePath(), "--silent", "--no-autotune"); System.setProperty("artemis.instance", instance1.getAbsolutePath()); File userFile = new File(instance1.getAbsolutePath() + "/etc/artemis-users.properties"); @@ -404,7 +404,7 @@ public class ArtemisTest { Run.setEmbedded(true); File instance1 = new File(temporaryFolder.getRoot(), "instance_user"); System.setProperty("java.security.auth.login.config", instance1.getAbsolutePath() + "/etc/login.config"); - Artemis.main("create", instance1.getAbsolutePath(), "--silent"); + Artemis.main("create", instance1.getAbsolutePath(), "--silent", "--no-autotune"); System.setProperty("artemis.instance", instance1.getAbsolutePath()); File userFile = new File(instance1.getAbsolutePath() + "/etc/artemis-users.properties"); @@ -559,7 +559,7 @@ public class ArtemisTest { Artemis.main("create", instanceFolder.getAbsolutePath(), "--force", "--silent", "--no-web", "--no-autotune", "--require-login"); System.setProperty("artemis.instance", instanceFolder.getAbsolutePath()); - Artemis.main("perf-journal", "--journal-type", "NIO", "--writes", "5000", "--tries", "50", "--verbose"); + Artemis.main("perf-journal", "--journal-type", "NIO", "--writes", "5", "--tries", "1", "--verbose"); } @@ -653,7 +653,7 @@ public class ArtemisTest { // This is usually set when run from the command line via artemis.profile Run.setEmbedded(true); - Artemis.main("create", instanceFolder.getAbsolutePath(), "--force", "--silent", "--no-web", "--queues", queues, "--topics", topics, "--no-autotune", "--require-login", "--ping", "127.0.0.1"); + Artemis.main("create", instanceFolder.getAbsolutePath(), "--force", "--silent", "--no-web", "--queues", queues, "--topics", topics, "--no-autotune", "--require-login", "--ping", "127.0.0.1", "--no-autotune"); System.setProperty("artemis.instance", instanceFolder.getAbsolutePath()); FileConfiguration fc = new FileConfiguration();
