From 308531e54b24e391cae543f950be739d467f636b Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Tue, 6 Dec 2016 14:50:15 +0200 Subject: [PATCH 1/4] Increase of timeout to pass test on Travis --- .../extensions/core/filter/DeviceAttributesFilterTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions-core/src/test/java/org/thingsboard/server/extensions/core/filter/DeviceAttributesFilterTest.java b/extensions-core/src/test/java/org/thingsboard/server/extensions/core/filter/DeviceAttributesFilterTest.java index 3095f5d0c4..bcaeeb5df1 100644 --- a/extensions-core/src/test/java/org/thingsboard/server/extensions/core/filter/DeviceAttributesFilterTest.java +++ b/extensions-core/src/test/java/org/thingsboard/server/extensions/core/filter/DeviceAttributesFilterTest.java @@ -71,7 +71,7 @@ public class DeviceAttributesFilterTest { filter.stop(); } - @Test(timeout = 10000) + @Test(timeout = 30000) public void basicClientAttributesStressTest() { DeviceAttributesFilter filter = new DeviceAttributesFilter(); filter.init(wrap("doubleValue == 1.0 && booleanValue == false")); From 302c9a798f4e53e71621599c2d6ecc4afb489bab Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 6 Dec 2016 16:54:06 +0200 Subject: [PATCH 2/4] Improve maven opts --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 68b4c026e5..3d6a84ca80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,7 @@ +before_install: + - sudo rm /etc/mavenrc + - export M2_HOME=/usr/local/maven + - export MAVEN_OPTS="-Dmaven.repo.local=$HOME/.m2/repository -Xms1024m -Xmx3072m -XX:PermSize=512m" jdk: - oraclejdk8 language: java From 5a32cb04f0251914b86d17b8d7b0207790260a4c Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 6 Dec 2016 16:56:02 +0200 Subject: [PATCH 3/4] Improve maven opts --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3d6a84ca80..27caacc68f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,5 +5,5 @@ before_install: jdk: - oraclejdk8 language: java -sudo: false +sudo: required script: mvn clean verify From 9352c40935247212bd62d1bd70ac2d8574b4732d Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 6 Dec 2016 17:47:05 +0200 Subject: [PATCH 4/4] Remove redudant java option --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 27caacc68f..a7332e8b8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ before_install: - sudo rm /etc/mavenrc - export M2_HOME=/usr/local/maven - - export MAVEN_OPTS="-Dmaven.repo.local=$HOME/.m2/repository -Xms1024m -Xmx3072m -XX:PermSize=512m" + - export MAVEN_OPTS="-Dmaven.repo.local=$HOME/.m2/repository -Xms1024m -Xmx3072m" jdk: - oraclejdk8 language: java