mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #981 from cdmihai/skipFlakyTests

Browse source 
Skip flaky incremental tests
This commit is contained in:
Piotr Puszkiewicz 2016-01-22 19:18:07 -08:00
commit 47ae5faf37
3 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/Microsoft.DotNet.Tools.Builder.Tests/BuildProjectToProjectTests.cs
View file

@ -15,10 +15,6 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
{ {
private string[] _projects = new[] { "L0", "L11", "L12", "L21", "L22" }; private string[] _projects = new[] { "L0", "L11", "L12", "L21", "L22" };
private string _testProjectsRoot = @"TestProjects";
private string _testProject = "TestProjectToProjectDependencies";
private TempDirectory tempProjectRoot;
public ProjectToProjectDependenciesIncrementalTest() : base( public ProjectToProjectDependenciesIncrementalTest() : base(
Path.Combine("TestProjects", "TestProjectToProjectDependencies"), Path.Combine("TestProjects", "TestProjectToProjectDependencies"),
"L0", "L0",

2
test/Microsoft.DotNet.Tools.Builder.Tests/IncrementalTestBase.cs
View file

@ -75,7 +75,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
protected static void AssertProjectSkipped(string skippedProject, CommandResult buildResult) protected static void AssertProjectSkipped(string skippedProject, CommandResult buildResult)
{ {
Assert.Contains($"Project {skippedProject} was previoulsy compiled. Skipping compilation.", buildResult.StdOut); Assert.Contains($"Project {skippedProject} was previoulsy compiled. Skipping compilation.", buildResult.StdOut, StringComparison.OrdinalIgnoreCase);
} }
protected static void AssertProjectCompiled(string rebuiltProject, CommandResult buildResult) protected static void AssertProjectCompiled(string rebuiltProject, CommandResult buildResult)

7
test/Microsoft.DotNet.Tools.Builder.Tests/IncrementalTests.cs
View file

@ -13,9 +13,6 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
{ {
public class IncrementalTests : IncrementalTestBase public class IncrementalTests : IncrementalTestBase
{ {
private string _testProjectsRoot = @"TestProjects";
private string _testProject = "TestProjectToProjectDependencies";
private TempDirectory tempProjectRoot;
public IncrementalTests() : base( public IncrementalTests() : base(
Path.Combine("TestProjects", "TestSimpleIncrementalApp"), Path.Combine("TestProjects", "TestSimpleIncrementalApp"),
@ -69,7 +66,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
Assert.Contains("does not have a lock file", buildResult.StdErr); Assert.Contains("does not have a lock file", buildResult.StdErr);
} }
[Fact] [Fact(Skip="https://github.com/dotnet/cli/issues/980")]
public void TestRebuildChangedLockFile() public void TestRebuildChangedLockFile()
{ {
@ -83,7 +80,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
AssertProjectCompiled(_mainProject, buildResult); AssertProjectCompiled(_mainProject, buildResult);
} }
[Fact] [Fact(Skip="https://github.com/dotnet/cli/issues/980")]
public void TestRebuildChangedProjectFile() public void TestRebuildChangedProjectFile()
{ {