incubator-slider git commit: SLIDER-1251 AASleepIT test fails to reach expected count

2017-10-11 Thread gourksaha 
Repository: incubator-slider
Updated Branches:
  refs/heads/develop 720bd19df -> 97498ec31


SLIDER-1251 AASleepIT test fails to reach expected count


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/97498ec3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/97498ec3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/97498ec3

Branch: refs/heads/develop
Commit: 97498ec312475bbb51e5bf3c1b846ddb54c12d3c
Parents: 720bd19
Author: Gour Saha 
Authored: Wed Oct 11 22:40:01 2017 -0700
Committer: Gour Saha 
Committed: Wed Oct 11 22:40:01 2017 -0700

--
 .../apache/slider/funtest/lifecycle/AASleepIT.groovy   | 13 +
 1 file changed, 5 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/97498ec3/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AASleepIT.groovy
--
diff --git 
a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AASleepIT.groovy
 
b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AASleepIT.groovy
index f070ce3..0466e15 100644
--- 
a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AASleepIT.groovy
+++ 
b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AASleepIT.groovy
@@ -142,15 +142,12 @@ public class AASleepIT extends AgentCommandTestBase
   int expected,
   NodeInformationList healthyNodes) {
 
-// now here await for the cluster size to grow: if it does, there's a 
problem
-// spin for a while and fail if the number ever goes above it.
-ClusterDescription cd = null
-(desired * 5).times {
-  cd = assertContainersLive(NAME, SLEEP_LONG, expected)
-  sleep(1000 * 10)
-}
+// the cluster size should not grow. wait for a while and fail
+// if it does.
+sleep(1000 * 10)
+ClusterDescription cd = assertContainersLive(NAME, SLEEP_LONG, expected)
 
-// here cluster is still 1 below expected
+// here cluster is still 1 below desired
 def role = cd.getRole(SLEEP_LONG)
 assert "1" == role.get(RoleKeys.ROLE_PENDING_AA_INSTANCES)
 assert 1 == 
cd.statistics[SLEEP_LONG][StatusKeys.STATISTICS_CONTAINERS_ANTI_AFFINE_PENDING]

incubator-slider git commit: SLIDER-1233 Lost nodes should not contribute to container failures (fix a fun-test)

2017-10-11 Thread gourksaha 
Repository: incubator-slider
Updated Branches:
  refs/heads/develop cc7a644ea -> 720bd19df


SLIDER-1233 Lost nodes should not contribute to container failures (fix a 
fun-test)


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/720bd19d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/720bd19d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/720bd19d

Branch: refs/heads/develop
Commit: 720bd19df9d2c0ad74cd536802a3c0028f7cfa96
Parents: cc7a644
Author: Gour Saha 
Authored: Wed Oct 11 17:25:23 2017 -0700
Committer: Gour Saha 
Committed: Wed Oct 11 17:25:23 2017 -0700

--
 .../org/apache/slider/funtest/lifecycle/AppsUpgradeIT.groovy  | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/720bd19d/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsUpgradeIT.groovy
--
diff --git 
a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsUpgradeIT.groovy
 
b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsUpgradeIT.groovy
index e18a757..7e9ebf5 100644
--- 
a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsUpgradeIT.groovy
+++ 
b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsUpgradeIT.groovy
@@ -161,9 +161,10 @@ public class AppsUpgradeIT extends AgentCommandTestBase
 ])
 
 // verify
-describe("COMMAND_LOGGER container failed count should reach 1")
-expectFailedContainerCountReached(APPLICATION_NAME, COMMAND_LOGGER, 1,
-CONTAINER_LAUNCH_TIMEOUT)
+describe("COMMAND_LOGGER container failed count should remain 0, since "
+  + "container kills during upgrade is not counted as failures")
+def failedCount = queryFailedCount(APPLICATION_NAME, COMMAND_LOGGER)
+assert failedCount == 0
 describe("COMMAND_LOGGER container request count should reach 1")
 expectContainerRequestedCountReached(APPLICATION_NAME, COMMAND_LOGGER, 1,
 CONTAINER_LAUNCH_TIMEOUT)