Repository: reef Updated Branches: refs/heads/master 0147a8932 -> 7e0f408c2
[REEF-1723] Fix TestFailMapperEvaluatorOnWaitingForEvaluatorAndExecution failures in AppVeyor This PR fixes the comparison condition in Assert. JIRA: [REEF-1723](https://issues.apache.org/jira/browse/REEF-1723) Pull Request: This closes #1274 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/7e0f408c Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/7e0f408c Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/7e0f408c Branch: refs/heads/master Commit: 7e0f408c2120f1b67524cf86a3dc8ddef7b4cefb Parents: 0147a89 Author: Julia Wang <[email protected]> Authored: Tue Mar 21 17:03:30 2017 -0700 Committer: Markus Weimer <[email protected]> Committed: Wed Mar 22 10:15:46 2017 -0700 ---------------------------------------------------------------------- ...TestFailMapperEvaluatorOnWaitingForEvaluatorAndExecution.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/7e0f408c/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorOnWaitingForEvaluatorAndExecution.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorOnWaitingForEvaluatorAndExecution.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorOnWaitingForEvaluatorAndExecution.cs index 88cde4f..c23c763 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorOnWaitingForEvaluatorAndExecution.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/IMRU/TestFailMapperEvaluatorOnWaitingForEvaluatorAndExecution.cs @@ -58,9 +58,11 @@ namespace Org.Apache.REEF.Tests.Functional.IMRU // on each try each task should fail or complete or disappear with failed evaluator // and on each try all tasks should start successfully - // There is an additional failed evaluator in the first time before tasks are submitted + // If the first evaluator fails before submitting tasks, there is an additional failed evaluator. Assert.True((NumberOfRetry + 1) * numTasks >= completedTaskCount + failedEvaluatorCount - 1 + failedTaskCount); - Assert.True(NumberOfRetry * numTasks < completedTaskCount + failedEvaluatorCount - 1 + failedTaskCount); + + // As the first evalautor might fail after tasks are submitted, then the completed# + failed# should be the same as normal FT scenarios. + Assert.True(NumberOfRetry * numTasks < completedTaskCount + failedEvaluatorCount + failedTaskCount); // There is a designed EvaluatorFailure in a childContext in the first run. // If this failure happens before all the tasks are submitted, after re-request an Evaluator, in the later tries,
