You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/08/15 00:01:05 UTC
[2/2] git commit: Property settings to allow Core and Services tests
to run (and succeed) consistently, REST still needs some work.
Property settings to allow Core and Services tests to run (and succeed) consistently, REST still needs some work.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5878b406
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5878b406
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5878b406
Branch: refs/heads/two-dot-o
Commit: 5878b4060fca47fc9068e8a5cd5285f9fb9f7941
Parents: 630e621
Author: Dave Johnson <dm...@apigee.com>
Authored: Thu Aug 14 17:54:07 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Thu Aug 14 17:54:07 2014 -0400
----------------------------------------------------------------------
.../usergrid/persistence/CollectionIT.java | 2 +-
.../resources/usergrid-custom-test.properties | 27 +++++++++-----
.../resources/usergrid-custom-test.properties | 38 +++++++++++++-------
.../resources/usergrid-custom-test.properties | 26 +++++++++-----
4 files changed, 63 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5878b406/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java
index 19d82be..6971217 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/CollectionIT.java
@@ -573,7 +573,7 @@ public class CollectionIT extends AbstractCoreIT {
public void emptyQueryReverse() throws Exception {
LOG.debug( "emptyQueryReverse" );
- UUID applicationId = setup.createApplication( "testOrganization", "testEmptyQueryReverse" );
+ UUID applicationId = setup.createApplication( "emptyQueryReverseOrg", "testEmptyQueryReverseApp" );
assertNotNull( applicationId );
EntityManager em = setup.getEmf().getEntityManager( applicationId );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5878b406/stack/core/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------
diff --git a/stack/core/src/test/resources/usergrid-custom-test.properties b/stack/core/src/test/resources/usergrid-custom-test.properties
index 62b4695..71ed1d4 100644
--- a/stack/core/src/test/resources/usergrid-custom-test.properties
+++ b/stack/core/src/test/resources/usergrid-custom-test.properties
@@ -1,13 +1,22 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License. See accompanying LICENSE file.
-cassandra.startup=embedded
+# Core module test properties
+# these settings allow tests to run and consistently pass on 16GB MacBook Pro
+# with ug.heapmax=5000m and ug.heapmin=3000m (set in Maven settings.xml)
+cassandra.startup=embedded
elasticsearch.startup=embedded
-
cassandra.timeout=5000
-cassandra.connections=1200
-
-collection.stage.transient.timeout=5
-
-hystrix.threadpool.graph_user.coreSize=40
-hystrix.threadpool.graph_async.coreSize=40
-
+cassandra.connections=1000
+hystrix.threadpool.graph_user.coreSize=100
+hystrix.threadpool.graph_async.coreSize=100
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5878b406/stack/rest/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/usergrid-custom-test.properties b/stack/rest/src/test/resources/usergrid-custom-test.properties
index fcb1630..901952f 100644
--- a/stack/rest/src/test/resources/usergrid-custom-test.properties
+++ b/stack/rest/src/test/resources/usergrid-custom-test.properties
@@ -1,20 +1,34 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License. See accompanying LICENSE file.
-usergrid.test=true
-
-usergrid.mongo.disable=true
-usergrid.counter.batch.size=1
-swagger.basepath=http://sometestvalue
+# REST module test properties
+# these settings allow tests to run and consistently pass on 16GB MacBook Pro
+# with ug.heapmax=5000m and ug.heapmin=3000m (set in Maven settings.xml)
tomcat.startup=embedded
-
-elasticsearch.startup=forked
-elasticsearch.force_refresh=false
-
cassandra.startup=forked
-cassandra.connections=600
+elasticsearch.startup=forked
cassandra.timeout=5000
+cassandra.connections=600
+hystrix.threadpool.graph_user.coreSize=30
+hystrix.threadpool.graph_async.coreSize=30
-hystrix.threadpool.graph_user.coreSize=20
-hystrix.threadpool.graph_async.coreSize=20
+# needed to enable refresh and properties end-points used in tests
+usergrid.test=true
+# needed for DuplicateNameIT
collection.stage.transient.timeout=5
+
+# other...
+usergrid.mongo.disable=true
+usergrid.counter.batch.size=1
+swagger.basepath=http://sometestvalue
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5878b406/stack/services/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------
diff --git a/stack/services/src/test/resources/usergrid-custom-test.properties b/stack/services/src/test/resources/usergrid-custom-test.properties
index c173396..7f141f8 100644
--- a/stack/services/src/test/resources/usergrid-custom-test.properties
+++ b/stack/services/src/test/resources/usergrid-custom-test.properties
@@ -1,12 +1,22 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License. See accompanying LICENSE file.
-cassandra.startup=embedded
+# Services module test properties
+# these settings allow tests to run and consistently pass on 16GB MacBook Pro
+# with ug.heapmax=5000m and ug.heapmin=3000m (set in Maven settings.xml)
+cassandra.startup=embedded
elasticsearch.startup=embedded
-
-cassandra.timeout=2000
+cassandra.timeout=5000
cassandra.connections=1000
-
-collection.stage.transient.timeout=60
-
-hystrix.threadpool.graph_user.coreSize=20
-hystrix.threadpool.graph_async.coreSize=20
+hystrix.threadpool.graph_user.coreSize=100
+hystrix.threadpool.graph_async.coreSize=100