ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpapirkovs...@apache.org
Subject [2/2] ambari git commit: AMBARI-19799. Optimize DB initialization for Ambari Server Unit Tests. Additional fixes. (mpapirkovskyy)
Date Wed, 01 Feb 2017 17:11:14 GMT
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/98baf6c0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/98baf6c0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/98baf6c0

Branch: refs/heads/branch-2.5
Commit: 98baf6c0494cd2b790c06386c6901c837f45d56f
Parents: 8aecca2
Author: Myroslav Papirkovskyi <mpapyrkovskyy@hortonworks.com>
Authored: Wed Feb 1 19:07:45 2017 +0200
Committer: Myroslav Papirkovskyi <mpapyrkovskyy@hortonworks.com>
Committed: Wed Feb 1 19:08:14 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/98baf6c0/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index fc7036a..f1db1ca 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -317,6 +317,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/98baf6c0/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 7e79934..d4e4975 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
@@ -75,8 +75,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"));
@@ -180,4 +180,4 @@ public class AsyncCallableServiceTest extends EasyMockSupport {
     verify();
     Assert.assertNull("Service result must be null", serviceResult);
   }
-}
\ No newline at end of file
+}


Mime
View raw message