Repository: ambari Updated Branches: refs/heads/branch-2.5 8aecca202 -> 98baf6c04 refs/heads/trunk 3a7906c84 -> 144449cba
AMBARI-19799. Optimize DB initialization for Ambari Server Unit Tests. Additional fixes. (mpapirkovskyy) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/144449cb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/144449cb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/144449cb Branch: refs/heads/trunk Commit: 144449cba7247d1b529e21b98c3fe9014c60b544 Parents: 3a7906c Author: Myroslav Papirkovskyi <mpapyrkovs...@hortonworks.com> Authored: Wed Feb 1 19:07:45 2017 +0200 Committer: Myroslav Papirkovskyi <mpapyrkovs...@hortonworks.com> Committed: Wed Feb 1 19:07:45 2017 +0200 ---------------------------------------------------------------------- ambari-server/pom.xml | 3 +++ .../ambari/server/topology/AsyncCallableServiceTest.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/144449cb/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index a9518e1..0441867 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -327,6 +327,9 @@ <!--Velocity log --> <exclude>**/velocity.log*</exclude> + + <!-- generated DDL--> + <exclude>**/createDDL.jdbc</exclude> </excludes> </configuration> <executions> http://git-wip-us.apache.org/repos/asf/ambari/blob/144449cb/ambari-server/src/test/java/org/apache/ambari/server/topology/AsyncCallableServiceTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/AsyncCallableServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/AsyncCallableServiceTest.java index 60bb2ba..4d96294 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/topology/AsyncCallableServiceTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/AsyncCallableServiceTest.java @@ -74,8 +74,8 @@ public class AsyncCallableServiceTest extends EasyMockSupport { public void testCallableServiceShouldCancelTaskWhenTimeoutExceeded() throws Exception { // GIVEN - //the timeout period should be small!!! - timeout = 1l; + //the timeout period should be less zero for guaranteed timeout! + timeout = -1l; // the task to be executed never completes successfully expect(futureMock.get(timeout, TimeUnit.MILLISECONDS)).andThrow(new TimeoutException("Testing the timeout exceeded case")); @@ -179,4 +179,4 @@ public class AsyncCallableServiceTest extends EasyMockSupport { verify(); Assert.assertNull("Service result must be null", serviceResult); } -} \ No newline at end of file +}
