You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/12/12 17:14:13 UTC
[2/2] ambari git commit: AMBARI-14305. Ambari Server Unit Test
failure on trunk and branch-2.2
(TestHeartbeatMonitor/testHeartbeatStateCommandsEnqueueing) (aonishuk)
AMBARI-14305. Ambari Server Unit Test failure on trunk and branch-2.2 (TestHeartbeatMonitor/testHeartbeatStateCommandsEnqueueing) (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/98a43319
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/98a43319
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/98a43319
Branch: refs/heads/branch-2.1
Commit: 98a43319eeaf4ef01277108f4e7f407c35b2c7e0
Parents: 51e8904
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Sat Dec 12 18:14:06 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Sat Dec 12 18:14:06 2015 +0200
----------------------------------------------------------------------
.../ambari/server/agent/TestHeartbeatMonitor.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/98a43319/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
index d3fee8b..9c59cde 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
@@ -370,9 +370,15 @@ public class TestHeartbeatMonitor {
hm.start();
Thread.sleep(3 * heartbeatMonitorWakeupIntervalMS);
hm.shutdown();
- hm.join(2*heartbeatMonitorWakeupIntervalMS);
- if (hm.isAlive()) {
- fail("HeartbeatMonitor should be already stopped");
+
+ int tryNumber = 0;
+ while(hm.isAlive()) {
+ hm.join(2*heartbeatMonitorWakeupIntervalMS);
+ tryNumber++;
+
+ if(tryNumber >= 5) {
+ fail("HeartbeatMonitor should be already stopped");
+ }
}
verify(aqMock, atLeast(2)).enqueue(eq(hostname1), commandCaptor.capture()); // After registration and by HeartbeatMonitor