Additional test adjustments to better work with CI environments.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a31fa45d Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a31fa45d Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a31fa45d Branch: refs/heads/master Commit: a31fa45dcb2e3474b75befcf0b19fea076e93993 Parents: 2389c20 Author: Michael Russo <mru...@apigee.com> Authored: Sat Nov 12 00:02:31 2016 -0800 Committer: Michael Russo <mru...@apigee.com> Committed: Sat Nov 12 00:02:31 2016 -0800 ---------------------------------------------------------------------- stack/core/src/test/resources/usergrid-custom-test.properties | 3 ++- .../collection/src/test/resources/dynamic-test.properties | 2 +- .../collection/src/test/resources/usergrid-CHOP.properties | 2 +- .../collection/src/test/resources/usergrid-UNIT.properties | 2 +- .../collection/src/test/resources/usergrid.properties | 2 +- .../common/src/test/resources/usergrid-UNIT.properties | 3 ++- .../graph/src/test/resources/usergrid-AWS.properties | 3 ++- .../graph/src/test/resources/usergrid-CHOP.properties | 3 ++- .../graph/src/test/resources/usergrid-UNIT.properties | 3 ++- stack/corepersistence/pom.xml | 2 +- .../queryindex/src/test/resources/dynamic-test.properties | 3 ++- .../queryindex/src/test/resources/usergrid-CHOP.properties | 3 ++- .../queryindex/src/test/resources/usergrid-UNIT.properties | 3 ++- stack/rest/src/test/resources/usergrid-custom-test.properties | 3 ++- stack/services/src/test/resources/usergrid-custom-test.properties | 3 ++- 15 files changed, 25 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/a31fa45d/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 ea78478..ffc7692 100644 --- a/stack/core/src/test/resources/usergrid-custom-test.properties +++ b/stack/core/src/test/resources/usergrid-custom-test.properties @@ -14,7 +14,8 @@ # 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.connections=100 +cassandra.connections=30 +cassandra.timeout.pool=20000 #Not a good number for real systems. Write shards should be 2x cluster size from our tests http://git-wip-us.apache.org/repos/asf/usergrid/blob/a31fa45d/stack/corepersistence/collection/src/test/resources/dynamic-test.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/resources/dynamic-test.properties b/stack/corepersistence/collection/src/test/resources/dynamic-test.properties index 1e27c18..5c68a4f 100644 --- a/stack/corepersistence/collection/src/test/resources/dynamic-test.properties +++ b/stack/corepersistence/collection/src/test/resources/dynamic-test.properties @@ -1,7 +1,7 @@ # The properties are not the actual configuration properties but # safe dynamic property defaults for our testing via IDE or Maven cassandra.connections=100 -cassandra.timeout.pool=10000 +cassandra.timeout.pool=20000 cassandra.port=9160 cassandra.hosts=localhost cassandra.cluster_name=Usergrid http://git-wip-us.apache.org/repos/asf/usergrid/blob/a31fa45d/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties b/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties index a21e09e..212650d 100644 --- a/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties +++ b/stack/corepersistence/collection/src/test/resources/usergrid-CHOP.properties @@ -19,7 +19,7 @@ # These are for CHOP environment settings cassandra.connections=100 -cassandra.timeout.pool=10000 +cassandra.timeout.pool=20000 cassandra.port=9160 # a comma delimited private IP address list to your chop cassandra cluster http://git-wip-us.apache.org/repos/asf/usergrid/blob/a31fa45d/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties b/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties index 56f025b..81faabf 100644 --- a/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties +++ b/stack/corepersistence/collection/src/test/resources/usergrid-UNIT.properties @@ -19,7 +19,7 @@ # Keep nothing but overriding test defaults in here cassandra.connections=100 -cassandra.timeout.pool=10000 +cassandra.timeout.pool=20000 cassandra.port=9160 cassandra.hosts=localhost cassandra.cluster_name=Usergrid http://git-wip-us.apache.org/repos/asf/usergrid/blob/a31fa45d/stack/corepersistence/collection/src/test/resources/usergrid.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/resources/usergrid.properties b/stack/corepersistence/collection/src/test/resources/usergrid.properties index 73e7875..0fa8f26 100644 --- a/stack/corepersistence/collection/src/test/resources/usergrid.properties +++ b/stack/corepersistence/collection/src/test/resources/usergrid.properties @@ -32,6 +32,6 @@ collection.uniquevalues.actors=300 collection.uniquevalues.authoritative.region=us-east cassandra.connections=100 -cassandra.timeout.pool=10000 +cassandra.timeout.pool=20000 # --- End: Usergrid cluster/actor system settings http://git-wip-us.apache.org/repos/asf/usergrid/blob/a31fa45d/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties b/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties index 9099751..34d7d48 100644 --- a/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties +++ b/stack/corepersistence/common/src/test/resources/usergrid-UNIT.properties @@ -18,7 +18,8 @@ # # Keep nothing but overriding test defaults in here -cassandra.connections=100 +cassandra.connections=30 +cassandra.timeout.pool=20000 cassandra.port=9160 cassandra.hosts=localhost cassandra.cluster_name=Usergrid http://git-wip-us.apache.org/repos/asf/usergrid/blob/a31fa45d/stack/corepersistence/graph/src/test/resources/usergrid-AWS.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/test/resources/usergrid-AWS.properties b/stack/corepersistence/graph/src/test/resources/usergrid-AWS.properties index ea921ae..5fa82b8 100644 --- a/stack/corepersistence/graph/src/test/resources/usergrid-AWS.properties +++ b/stack/corepersistence/graph/src/test/resources/usergrid-AWS.properties @@ -1,5 +1,6 @@ # Keep nothing but overriding test defaults in here -cassandra.connections=100 +cassandra.connections=30 +cassandra.timeout.pool=20000 cassandra.port=9160 cassandra.hosts= #cassandra.hosts=localhost http://git-wip-us.apache.org/repos/asf/usergrid/blob/a31fa45d/stack/corepersistence/graph/src/test/resources/usergrid-CHOP.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/test/resources/usergrid-CHOP.properties b/stack/corepersistence/graph/src/test/resources/usergrid-CHOP.properties index 43f8c86..474c2de 100644 --- a/stack/corepersistence/graph/src/test/resources/usergrid-CHOP.properties +++ b/stack/corepersistence/graph/src/test/resources/usergrid-CHOP.properties @@ -1,6 +1,7 @@ # These are for CHOP environment settings -cassandra.connections=100 +cassandra.connections=30 +cassandra.timeout.pool=20000 cassandra.port=9160 # a comma delimited private IP address list to your chop cassandra cluster http://git-wip-us.apache.org/repos/asf/usergrid/blob/a31fa45d/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties b/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties index 89430c6..a9a7c40 100644 --- a/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties +++ b/stack/corepersistence/graph/src/test/resources/usergrid-UNIT.properties @@ -1,5 +1,6 @@ # Keep nothing but overriding test defaults in here -cassandra.connections=100 +cassandra.connections=30 +cassandra.timeout.pool=20000 cassandra.port=9160 cassandra.hosts=localhost cassandra.cluster_name=Usergrid http://git-wip-us.apache.org/repos/asf/usergrid/blob/a31fa45d/stack/corepersistence/pom.xml ---------------------------------------------------------------------- diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml index 56c6016..eef6b86 100644 --- a/stack/corepersistence/pom.xml +++ b/stack/corepersistence/pom.xml @@ -80,7 +80,7 @@ limitations under the License. <commons.collections.version>3.2.1</commons.collections.version> <commons.io.version>2.4</commons.io.version> <commons.lang.version>3.1</commons.lang.version> - <datastax.version>2.1.10</datastax.version> + <datastax.version>2.1.10.3</datastax.version> <elasticsearch.version>1.4.4</elasticsearch.version> <fasterxml-uuid.version>3.1.3</fasterxml-uuid.version> <guava.version>18.0</guava.version> http://git-wip-us.apache.org/repos/asf/usergrid/blob/a31fa45d/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties b/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties index c6dc9c4..8e2d22c 100644 --- a/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties +++ b/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties @@ -1,6 +1,7 @@ # The properties are not the actual configuration properties but # safe dynamic property defaults for our testing via IDE or Maven -cassandra.connections=100 +cassandra.connections=30 +cassandra.timeout.pool=20000 cassandra.port=9160 cassandra.hosts=localhost cassandra.cluster_name=Usergrid http://git-wip-us.apache.org/repos/asf/usergrid/blob/a31fa45d/stack/corepersistence/queryindex/src/test/resources/usergrid-CHOP.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/resources/usergrid-CHOP.properties b/stack/corepersistence/queryindex/src/test/resources/usergrid-CHOP.properties index d57e46c..e1fb08a 100644 --- a/stack/corepersistence/queryindex/src/test/resources/usergrid-CHOP.properties +++ b/stack/corepersistence/queryindex/src/test/resources/usergrid-CHOP.properties @@ -1,5 +1,6 @@ # These are for CHOP environment settings -cassandra.connections=100 +cassandra.connections=30 +cassandra.timeout.pool=20000 cassandra.port=9160 # a comma delimited private IP address list to your chop cassandra cluster http://git-wip-us.apache.org/repos/asf/usergrid/blob/a31fa45d/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties b/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties index 443990f..628998b 100644 --- a/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties +++ b/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties @@ -4,7 +4,8 @@ cassandra.embedded=true cassandra.hosts=127.0.0.1 cassandra.port=9160 cassandra.cluster_name=Usergrid -cassandra.connections=100 +cassandra.connections=30 +cassandra.timeout.pool=20000 collections.keyspace=Usergrid_Collections collections.keyspace.strategy.options=replication_factor:1 http://git-wip-us.apache.org/repos/asf/usergrid/blob/a31fa45d/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 37ac5bc..c9aa362 100644 --- a/stack/rest/src/test/resources/usergrid-custom-test.properties +++ b/stack/rest/src/test/resources/usergrid-custom-test.properties @@ -16,7 +16,8 @@ # REST module test properties cassandra.startup=external -cassandra.connections=100 +cassandra.connections=30 +cassandra.timeout.pool=20000 elasticsearch.startup=external http://git-wip-us.apache.org/repos/asf/usergrid/blob/a31fa45d/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 6d97a91..291936a 100644 --- a/stack/services/src/test/resources/usergrid-custom-test.properties +++ b/stack/services/src/test/resources/usergrid-custom-test.properties @@ -16,7 +16,8 @@ # with ug.heapmax=5000m and ug.heapmin=3000m (set in Maven settings.xml) cassandra.startup=external elasticsearch.startup=external -cassandra.connections=100 +cassandra.connections=30 +cassandra.timeout.pool=20000 #Poll interval to check for new jobs in millseconds. 10 milliseconds for testing usergrid.scheduler.job.interval=100
