Repository: reef Updated Branches: refs/heads/master e04b42271 -> 3787a6cbc
[REEF-1293] Fix test failures during file extraction from jar This change: * makes REEF functional tests run in sequence instead of in parallel. * stops extracting .jar file by a test if it's already been extracted by another one. JIRA: [REEF-1293](https://issues.apache.org/jira/browse/REEF-1293) Pull request: This closes #923 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/3787a6cb Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/3787a6cb Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/3787a6cb Branch: refs/heads/master Commit: 3787a6cbcdb2328a05cabef03b9314b6261d7a59 Parents: e04b422 Author: Mariia Mykhailova <[email protected]> Authored: Mon Apr 4 11:32:39 2016 -0700 Committer: Markus Weimer <[email protected]> Committed: Mon Apr 4 17:49:23 2016 -0700 ---------------------------------------------------------------------- .../Common/DriverFolderPreparationHelper.cs | 5 ++++- .../Functional/FaultTolerant/TestContextStart.cs | 1 + .../Org.Apache.REEF.Tests/Utility/TestDriverConfigGenerator.cs | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/3787a6cb/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs b/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs index 4f3f811..0e31d33 100644 --- a/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs +++ b/lang/cs/Org.Apache.REEF.Client/Common/DriverFolderPreparationHelper.cs @@ -127,7 +127,10 @@ namespace Org.Apache.REEF.Client.Common { fileName = Path.Combine(driverFolderPath, _fileNames.GetBridgeExePath()); } - File.WriteAllBytes(fileName, resourceHelper.GetBytes(fileResources.Value)); + if (!File.Exists(fileName)) + { + File.WriteAllBytes(fileName, resourceHelper.GetBytes(fileResources.Value)); + } } // generate .config file for bridge executable http://git-wip-us.apache.org/repos/asf/reef/blob/3787a6cb/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 7834f38..dce71ac 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/FaultTolerant/TestContextStart.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/FaultTolerant/TestContextStart.cs @@ -35,6 +35,7 @@ namespace Org.Apache.REEF.Tests.Functional.FaultTolerant /// <summary> /// This test case servers as an example to put data downloading at part of the ContextStartHandler /// </summary> + [Collection("FunctionalTests")] public class TestContextStart : ReefFunctionalTest { private static readonly Logger Logger = Logger.GetLogger(typeof(TestContextStart)); http://git-wip-us.apache.org/repos/asf/reef/blob/3787a6cb/lang/cs/Org.Apache.REEF.Tests/Utility/TestDriverConfigGenerator.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Utility/TestDriverConfigGenerator.cs b/lang/cs/Org.Apache.REEF.Tests/Utility/TestDriverConfigGenerator.cs index 9ce9d1a..1099f06 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Utility/TestDriverConfigGenerator.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Utility/TestDriverConfigGenerator.cs @@ -24,6 +24,7 @@ using Xunit; namespace Org.Apache.REEF.Tests.Utility { + [Collection("FunctionalTests")] public class TestDriverConfigGenerator { public TestDriverConfigGenerator()
