Repository: reef Updated Branches: refs/heads/master 4088f3c73 -> 3d9b5c2fc
[REEF-1265] Clean up tests inherited from ReefFunctionalTests This change: * unifies randomized runtime folder naming across all tests * makes Thread.Sleep() in CleanUp conditional to speed up execution * removes CleanUp calls before test execution * removes individual constructors of the tests and replaces them with constructor in ReefFunctionalTest JIRA: [REEF-1265](https://issues.apache.org/jira/browse/REEF-1265) Pull request: This closes #917 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/3d9b5c2f Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/3d9b5c2f Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/3d9b5c2f Branch: refs/heads/master Commit: 3d9b5c2fcd983886725099d8ea1d7dd1f1888725 Parents: 4088f3c Author: Mariia Mykhailova <[email protected]> Authored: Thu Mar 31 17:45:54 2016 -0700 Committer: Julia Wang <[email protected]> Committed: Fri Apr 1 17:52:04 2016 -0700 ---------------------------------------------------------------------- .../Functional/Bridge/TestBridgeClient.cs | 10 ++------- .../Functional/Bridge/TestCloseTask.cs | 5 ----- .../Functional/Bridge/TestContextStack.cs | 7 ------ .../Bridge/TestFailedEvaluatorEventHandler.cs | 7 +----- .../Bridge/TestFailedTaskEventHandler.cs | 8 +------ .../Functional/Bridge/TestSimpleContext.cs | 8 +------ .../Bridge/TestSimpleEventHandlers.cs | 8 +------ .../Functional/Bridge/TestSuspendTask.cs | 8 +------ .../Functional/Driver/TestDriver.cs | 9 ++------ .../FaultTolerant/TestContextStart.cs | 7 +----- .../Functional/Group/BroadcastReduceTest.cs | 11 +++------- .../Group/PipelinedBroadcastReduceTest.cs | 11 +++------- .../Functional/Group/ScatterReduceTest.cs | 12 +++------- .../Functional/ML/KMeans/TestKMeans.cs | 6 ++--- .../Functional/Messaging/TestTaskMessage.cs | 9 +------- .../Functional/ReefFunctionalTest.cs | 23 +++++++++++++------- .../Functional/RuntimeName/RuntimeNameTest.cs | 8 +------ 17 files changed, 39 insertions(+), 118 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestBridgeClient.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestBridgeClient.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestBridgeClient.cs index 44c1ea9..f72399b 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestBridgeClient.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestBridgeClient.cs @@ -29,18 +29,13 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge { private static readonly Logger LOGGER = Logger.GetLogger(typeof(TestBridgeClient)); - public TestBridgeClient() - { - Init(); - } - [Fact(Skip = "Requires Yarn")] [Trait("Priority", "1")] [Trait("Category", "FunctionalGated")] [Trait("Description", "Run CLR Bridge on Yarn")] public async Task CanRunClrBridgeExampleOnYarn() { - string testRuntimeFolder = DefaultRuntimeFolder + TestNumber++; + string testRuntimeFolder = DefaultRuntimeFolder + TestId; await RunClrBridgeClient(true, testRuntimeFolder); } @@ -51,8 +46,7 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge //// TODO[JIRA REEF-1184]: add timeout 180 sec public async Task CanRunClrBridgeExampleOnLocalRuntime() { - string testRuntimeFolder = DefaultRuntimeFolder + TestNumber++; - CleanUp(testRuntimeFolder); + string testRuntimeFolder = DefaultRuntimeFolder + TestId; await RunClrBridgeClient(false, testRuntimeFolder); } http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestCloseTask.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestCloseTask.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestCloseTask.cs index aeb0917..a18a211 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestCloseTask.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestCloseTask.cs @@ -52,11 +52,6 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge private const string CompletedValidationMessage = "CompletedValidationmessage"; private const string FailToCloseTaskMessage = "FailToCloseTaskMessage"; - public TestCloseTask() - { - Init(); - } - /// <summary> /// This test is close a running task with a close handler registered /// </summary> http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestContextStack.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestContextStack.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestContextStack.cs index e21065c..bfc91c1 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestContextStack.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestContextStack.cs @@ -44,11 +44,6 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge private static readonly Logger Logger = Logger.GetLogger(typeof(TestContextStack)); - public TestContextStack() - { - Init(); - } - /// <summary> /// Does a simple test of whether a context can be submitted on top of another context. /// </summary> @@ -56,7 +51,6 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge public void TestContextStackingOnLocalRuntime() { string testFolder = DefaultRuntimeFolder + Guid.NewGuid().ToString("N").Substring(0, 4); - CleanUp(testFolder); TestRun(DriverConfigurations(GenericType<ActiveContextSubmitContextHandler>.Class), typeof(ContextStackHandlers), 1, "testContextStack", "local", testFolder); ValidateSuccessForLocalRuntime(2, testFolder: testFolder); @@ -73,7 +67,6 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge public void TestContextStackingWithServiceOnLocalRuntime() { string testFolder = DefaultRuntimeFolder + Guid.NewGuid().ToString("N").Substring(0, 4); - CleanUp(testFolder); TestRun(DriverConfigurations(GenericType<ActiveContextSubmitContextAndServiceHandler>.Class), typeof(ContextStackHandlers), 1, "testContextAndServiceStack", "local", testFolder); ValidateSuccessForLocalRuntime(2, testFolder: testFolder); http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedEvaluatorEventHandler.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedEvaluatorEventHandler.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedEvaluatorEventHandler.cs index a10f596..123bdc6 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedEvaluatorEventHandler.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedEvaluatorEventHandler.cs @@ -42,11 +42,6 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge private const string FailSignal = "Fail"; private const string TaskId = "1234567"; - public TestFailedEvaluatorEventHandler() - { - Init(); - } - [Fact] [Trait("Priority", "1")] [Trait("Category", "FunctionalGated")] @@ -54,7 +49,7 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge //// TODO[JIRA REEF-1184]: add timeout 180 sec public void TestFailedEvaluatorEventHandlerOnLocalRuntime() { - string testFolder = DefaultRuntimeFolder + Guid.NewGuid().ToString("N").Substring(0, 4); + string testFolder = DefaultRuntimeFolder + TestId; TestRun(DriverConfigurations(), typeof(FailedEvaluatorDriver), 1, "failedEvaluatorTest", "local", testFolder); ValidateSuccessForLocalRuntime(0, numberOfEvaluatorsToFail: 1, testFolder: testFolder); ValidateMessageSuccessfullyLoggedForDriver(FailedEvaluatorMessage, testFolder); http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedTaskEventHandler.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedTaskEventHandler.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedTaskEventHandler.cs index db1001b..dbe512c 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedTaskEventHandler.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestFailedTaskEventHandler.cs @@ -35,11 +35,6 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge { private const string FailedTaskMessage = "I have successfully seen a failed task."; - public TestFailedTaskEventHandler() - { - Init(); - } - [Fact] [Trait("Priority", "1")] [Trait("Category", "FunctionalGated")] @@ -47,8 +42,7 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge //// TODO[JIRA REEF-1184]: add timeout 180 sec public void TestFailedTaskEventHandlerOnLocalRuntime() { - string testFolder = DefaultRuntimeFolder + Guid.NewGuid().ToString("N").Substring(0, 4); - CleanUp(testFolder); + string testFolder = DefaultRuntimeFolder + TestId; TestRun(DriverConfigurations(), typeof(FailedTaskDriver), 1, "failedTaskTest", "local", testFolder); ValidateSuccessForLocalRuntime(numberOfContextsToClose: 1, numberOfTasksToFail: 1, testFolder: testFolder); ValidateMessageSuccessfullyLoggedForDriver(FailedTaskMessage, testFolder); http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleContext.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleContext.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleContext.cs index d0da1ba..cf75fd0 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleContext.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleContext.cs @@ -40,11 +40,6 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge private static readonly Logger Logger = Logger.GetLogger(typeof(TestSimpleContext)); - public TestSimpleContext() - { - Init(); - } - /// <summary> /// Does a simple test of context submission. /// </summary> @@ -60,8 +55,7 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge private void TestContextOnLocalRuntime(IConfiguration configuration) { - string testFolder = DefaultRuntimeFolder + Guid.NewGuid().ToString("N").Substring(0, 4); - CleanUp(testFolder); + string testFolder = DefaultRuntimeFolder + TestId; TestRun(configuration, typeof(TestContextHandlers), 1, "testSimpleContext", "local", testFolder); ValidateSuccessForLocalRuntime(1, testFolder: testFolder); ValidateMessageSuccessfullyLoggedForDriver(ValidationMessage, testFolder); http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleEventHandlers.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleEventHandlers.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleEventHandlers.cs index f8b5dbe..da0d724 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleEventHandlers.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSimpleEventHandlers.cs @@ -34,11 +34,6 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge [Collection("FunctionalTests")] public class TestSimpleEventHandlers : ReefFunctionalTest { - public TestSimpleEventHandlers() - { - Init(); - } - [Fact] [Trait("Priority", "1")] [Trait("Category", "FunctionalGated")] @@ -46,8 +41,7 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge //// TODO[JIRA REEF-1184]: add timeout 180 sec public void RunSimpleEventHandlerOnLocalRuntime() { - string testFolder = DefaultRuntimeFolder + Guid.NewGuid().ToString("N").Substring(0, 4); - CleanUp(testFolder); + string testFolder = DefaultRuntimeFolder + TestId; TestRun(DriverConfigurations(), typeof(HelloSimpleEventHandlers), 2, "simpleHandler", "local", testFolder); ValidateSuccessForLocalRuntime(1, testFolder: testFolder); ValidateMessageSuccessfullyLoggedForDriver("Evaluator is assigned with 3072 MB of memory and 1 cores.", testFolder); http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSuspendTask.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSuspendTask.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSuspendTask.cs index ce118f5..18725e3 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSuspendTask.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Bridge/TestSuspendTask.cs @@ -44,11 +44,6 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge private const string SuspendValidationMessage = "SuspendValidationMessage"; private const string CompletedValidationMessage = "CompletedValidationmessage"; - public TestSuspendTask() - { - Init(); - } - /// <summary> /// Does a simple test of invoking suspend task with a message from the Driver /// and makes sure the target task receives the suspend message. @@ -58,8 +53,7 @@ namespace Org.Apache.REEF.Tests.Functional.Bridge [Fact] public void TestSuspendTaskOnLocalRuntime() { - string testFolder = DefaultRuntimeFolder + Guid.NewGuid().ToString("N").Substring(0, 4); - CleanUp(testFolder); + string testFolder = DefaultRuntimeFolder + TestId; TestRun(DriverConfigurations(), typeof(SuspendTaskHandlers), 1, "testSuspendTask", "local", testFolder); ValidateSuccessForLocalRuntime(1, testFolder: testFolder); ValidateMessageSuccessfullyLoggedForDriver(SuspendValidationMessage, testFolder); http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/Driver/TestDriver.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Driver/TestDriver.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Driver/TestDriver.cs index 9c3e9a2..e0d835f 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Driver/TestDriver.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Driver/TestDriver.cs @@ -29,11 +29,6 @@ namespace Org.Apache.REEF.Tests.Functional.Driver [Collection("FunctionalTests")] public class TestDriver : ReefFunctionalTest { - public TestDriver() - { - CleanUp(); - } - /// <summary> /// This is to test DriverTestStartHandler. No evaluator and tasks are involved. /// </summary> @@ -44,10 +39,10 @@ namespace Org.Apache.REEF.Tests.Functional.Driver //// TODO[JIRA REEF-1184]: add timeout 180 sec public void TestDriverStart() { - string testFolder = DefaultRuntimeFolder + TestNumber++; - CleanUp(testFolder); + string testFolder = DefaultRuntimeFolder + TestId; TestRun(DriverConfigurations(), typeof(DriverTestStartHandler), 0, "DriverTestStartHandler", "local", testFolder); ValidateSuccessForLocalRuntime(0, testFolder: testFolder); + CleanUp(testFolder); } public IConfiguration DriverConfigurations() http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/FaultTolerant/TestContextStart.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/FaultTolerant/TestContextStart.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/FaultTolerant/TestContextStart.cs index 6a421aa..7834f38 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/FaultTolerant/TestContextStart.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/FaultTolerant/TestContextStart.cs @@ -42,18 +42,13 @@ namespace Org.Apache.REEF.Tests.Functional.FaultTolerant private const string StartedMessage = "Do something started."; private const string CompletedMessage = "Do something completed."; - public TestContextStart() - { - Init(); - } - /// <summary> /// This test case submit a context with a Context start handler and do something in the handler /// </summary> [Fact] public void TestDosomethingOnContextStartOnLocalRuntime() { - string testFolder = DefaultRuntimeFolder + Guid.NewGuid().ToString("N").Substring(0, 4); + string testFolder = DefaultRuntimeFolder + TestId; TestRun(DriverConfigurations(), typeof(ContextStartDriver), 1, "ContextStartDriver", "local", testFolder); ValidateSuccessForLocalRuntime(2, testFolder: testFolder); http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/Group/BroadcastReduceTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/BroadcastReduceTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/BroadcastReduceTest.cs index 6809105..3297aa1 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/BroadcastReduceTest.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/BroadcastReduceTest.cs @@ -34,26 +34,21 @@ namespace Org.Apache.REEF.Tests.Functional.Group [Collection("FunctionalTests")] public class BroadcastReduceTest : ReefFunctionalTest { - public BroadcastReduceTest() - { - CleanUp(); - } - [Fact] public void TestBroadcastAndReduceOnLocalRuntime() { int numTasks = 9; - string testFolder = DefaultRuntimeFolder + TestNumber++; - CleanUp(testFolder); + string testFolder = DefaultRuntimeFolder + TestId; TestBroadcastAndReduce(false, numTasks, testFolder); ValidateSuccessForLocalRuntime(numTasks, testFolder: testFolder); + CleanUp(testFolder); } [Fact(Skip = "Requires Yarn")] public void TestBroadcastAndReduceOnYarn() { int numTasks = 9; - string testFolder = DefaultRuntimeFolder + TestNumber++; + string testFolder = DefaultRuntimeFolder + TestId + "Yarn"; TestBroadcastAndReduce(true, numTasks, testFolder); } http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/Group/PipelinedBroadcastReduceTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/PipelinedBroadcastReduceTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/PipelinedBroadcastReduceTest.cs index d83f107..fd80195 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/PipelinedBroadcastReduceTest.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/PipelinedBroadcastReduceTest.cs @@ -34,26 +34,21 @@ namespace Org.Apache.REEF.Tests.Functional.Group [Collection("FunctionalTests")] public class PipelinedBroadcastReduceTest : ReefFunctionalTest { - public PipelinedBroadcastReduceTest() - { - CleanUp(); - } - [Fact] public void TestPipelinedBroadcastAndReduceOnLocalRuntime() { const int numTasks = 9; - string testFolder = DefaultRuntimeFolder + TestNumber++; - CleanUp(testFolder); + string testFolder = DefaultRuntimeFolder + TestId; TestBroadcastAndReduce(false, numTasks, testFolder); ValidateSuccessForLocalRuntime(numTasks, testFolder: testFolder); + CleanUp(testFolder); } [Fact(Skip = "Requires Yarn")] public void TestPipelinedBroadcastAndReduceOnYarn() { const int numTasks = 9; - string testFolder = DefaultRuntimeFolder + TestNumber++; + string testFolder = DefaultRuntimeFolder + TestId + "Yarn"; TestBroadcastAndReduce(true, numTasks, testFolder); } http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/Group/ScatterReduceTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/ScatterReduceTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/ScatterReduceTest.cs index e53b048..14f2b8c 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Group/ScatterReduceTest.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Group/ScatterReduceTest.cs @@ -34,27 +34,21 @@ namespace Org.Apache.REEF.Tests.Functional.Group [Collection("FunctionalTests")] public class ScatterReduceTest : ReefFunctionalTest { - public ScatterReduceTest() - { - CleanUp(); - } - [Fact] public void TestScatterAndReduceOnLocalRuntime() { int numTasks = 5; - string testFolder = DefaultRuntimeFolder + TestNumber++; - CleanUp(testFolder); + string testFolder = DefaultRuntimeFolder + TestId; TestScatterAndReduce(false, numTasks, testFolder); ValidateSuccessForLocalRuntime(numTasks, testFolder: testFolder); + CleanUp(testFolder); } [Fact(Skip = "Requires Yarn")] public void TestScatterAndReduceOnYarn() { int numTasks = 5; - string testFolder = DefaultRuntimeFolder + TestNumber++; - CleanUp(testFolder); + string testFolder = DefaultRuntimeFolder + TestId + "Yarn"; TestScatterAndReduce(true, numTasks, testFolder); } http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/ML/KMeans/TestKMeans.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/ML/KMeans/TestKMeans.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/ML/KMeans/TestKMeans.cs index 4cb70e8..a90901a 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/ML/KMeans/TestKMeans.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/ML/KMeans/TestKMeans.cs @@ -115,10 +115,10 @@ namespace Org.Apache.REEF.Tests.Functional.ML.KMeans public void TestKMeansOnLocalRuntimeWithGroupCommunications() { IsOnLocalRuntime = true; - string testFolder = DefaultRuntimeFolder + TestNumber++; - CleanUp(testFolder); + string testFolder = DefaultRuntimeFolder + TestId; TestRun(DriverConfiguration(), typeof(KMeansDriverHandlers), Partitions + 1, "KMeansDriverHandlers", "local", testFolder); ValidateSuccessForLocalRuntime(Partitions + 1, testFolder: testFolder); + CleanUp(testFolder); } [Fact(Skip = "TODO[JIRA REEF-1183] Requires data files not present in enlistment")] @@ -128,7 +128,7 @@ namespace Org.Apache.REEF.Tests.Functional.ML.KMeans //// TODO[JIRA REEF-1184]: add timeout 180 sec public void TestKMeansOnYarnOneBoxWithGroupCommunications() { - string testFolder = DefaultRuntimeFolder + TestNumber++; + string testFolder = DefaultRuntimeFolder + TestId + "Yarn"; TestRun(DriverConfiguration(), typeof(KMeansDriverHandlers), Partitions + 1, "KMeansDriverHandlers", "yarn", testFolder); Assert.NotNull("BreakPointChecker"); } http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/TestTaskMessage.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/TestTaskMessage.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/TestTaskMessage.cs index 739b2a0..b23e5e1 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/TestTaskMessage.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/Messaging/TestTaskMessage.cs @@ -34,12 +34,6 @@ namespace Org.Apache.REEF.Tests.Functional.Messaging [Collection("FunctionalTests")] public class TestTaskMessage : ReefFunctionalTest { - public TestTaskMessage() - { - CleanUp(); - Init(); - } - /// <summary> /// This test is to test both task message and driver message. The messages are sent /// from one side and received in the corresponding handlers and verified in the test @@ -51,8 +45,7 @@ namespace Org.Apache.REEF.Tests.Functional.Messaging //// TODO[JIRA REEF-1184]: add timeout 180 sec public void TestSendTaskMessage() { - string testFolder = DefaultRuntimeFolder + Guid.NewGuid(); - CleanUp(testFolder); + string testFolder = DefaultRuntimeFolder + TestId; TestRun(DriverConfigurations(), typeof(MessageDriver), 1, "simpleHandler", "local", testFolder); ValidateSuccessForLocalRuntime(1, testFolder: testFolder); http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs index ef7207a..4b1bf0c 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs @@ -46,7 +46,6 @@ namespace Org.Apache.REEF.Tests.Functional protected const string CmdFile = "run.cmd"; protected const string BinFolder = "."; - protected static int TestNumber = 1; protected const string DefaultRuntimeFolder = "REEF_LOCAL_RUNTIME"; private const string Local = "local"; @@ -79,6 +78,11 @@ namespace Org.Apache.REEF.Tests.Functional set { _onLocalRuntime = value; } } + public ReefFunctionalTest() + { + Init(); + } + public void Init() { TestId = Guid.NewGuid().ToString("N").Substring(0, 8); @@ -111,15 +115,18 @@ namespace Org.Apache.REEF.Tests.Functional { Console.WriteLine("Cleaning up test."); - if (TimerTask != null) + if (_enableRealtimeLogUpload) { - TestTimer.Stop(); - TimerTask.Dispose(); - TimerTask = null; + if (TimerTask != null) + { + TestTimer.Stop(); + TimerTask.Dispose(); + TimerTask = null; + } + + // Wait for file upload task to complete + Thread.Sleep(500); } - - // Wait for file upload task to complete - Thread.Sleep(500); string dir = Path.Combine(Directory.GetCurrentDirectory(), testFolder); try http://git-wip-us.apache.org/repos/asf/reef/blob/3d9b5c2f/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTest.cs index fa08054..c18e3b4 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTest.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/RuntimeName/RuntimeNameTest.cs @@ -32,11 +32,6 @@ namespace Org.Apache.REEF.Tests.Functional.Driver [Collection("FunctionalTests")] public class RuntimeNameTest : ReefFunctionalTest { - public RuntimeNameTest() - { - CleanUp(); - } - /// <summary> /// This is to test DriverTestStartHandler. No evaluator and tasks are involved. /// </summary> @@ -47,8 +42,7 @@ namespace Org.Apache.REEF.Tests.Functional.Driver //// TODO[JIRA REEF-1184]: add timeout 180 sec public void TestRuntimeName() { - string testFolder = DefaultRuntimeFolder + TestNumber++; - CleanUp(testFolder); + string testFolder = DefaultRuntimeFolder + TestId; TestRun(DriverConfigurationsWithEvaluatorRequest(), typeof(EvaluatorRequestingDriver), 1, "EvaluatorRequestingDriver", "local", testFolder); ValidateMessageSuccessfullyLoggedForDriver("Runtime Name: Local", testFolder, 2); CleanUp(testFolder);
