huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Helix] Reenable dotnet-watch on helix (#8258)

This commit is contained in:
Hao Kung 2019-03-08 11:32:02 -08:00 committed by GitHub
parent 2cf67cb7c0
commit a53accfd75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Tools/dotnet-watch/test/DotNetWatcherTests.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Globalization; using System.Globalization;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Testing.xunit;
using Xunit; using Xunit;
using Xunit.Abstractions; using Xunit.Abstractions;
@ -22,7 +23,8 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
_app = new KitchenSinkApp(logger); _app = new KitchenSinkApp(logger);
} }
[Fact] [ConditionalFact]
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/8267
public async Task RunsWithDotnetWatchEnvVariable() public async Task RunsWithDotnetWatchEnvVariable()
{ {
Assert.True(string.IsNullOrEmpty(Environment.GetEnvironmentVariable("DOTNET_WATCH")), "DOTNET_WATCH cannot be set already when this test is running"); Assert.True(string.IsNullOrEmpty(Environment.GetEnvironmentVariable("DOTNET_WATCH")), "DOTNET_WATCH cannot be set already when this test is running");

16
src/Tools/dotnet-watch/test/GlobbingAppTests.cs
View File

@ -6,6 +6,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Testing.xunit;
using Microsoft.DotNet.Watcher.Tools.Tests; using Microsoft.DotNet.Watcher.Tools.Tests;
using Xunit; using Xunit;
using Xunit.Abstractions; using Xunit.Abstractions;
@ -20,9 +21,10 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
_app = new GlobbingApp(logger); _app = new GlobbingApp(logger);
} }
[Theory] [ConditionalTheory]
[InlineData(true)] [InlineData(true)]
[InlineData(false)] [InlineData(false)]
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/8267
public async Task ChangeCompiledFile(bool usePollingWatcher) public async Task ChangeCompiledFile(bool usePollingWatcher)
{ {
_app.UsePollingWatcher = usePollingWatcher; _app.UsePollingWatcher = usePollingWatcher;
@ -40,7 +42,8 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
Assert.Equal(2, types); Assert.Equal(2, types);
} }
[Fact] [ConditionalFact]
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/8267
public async Task DeleteCompiledFile() public async Task DeleteCompiledFile()
{ {
await _app.StartWatcherAsync(); await _app.StartWatcherAsync();
@ -56,7 +59,8 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
Assert.Equal(1, types); Assert.Equal(1, types);
} }
[Fact] [ConditionalFact]
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/8267
public async Task DeleteSourceFolder() public async Task DeleteSourceFolder()
{ {
await _app.StartWatcherAsync(); await _app.StartWatcherAsync();
@ -84,7 +88,8 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
await _app.HasRestarted(); await _app.HasRestarted();
} }
[Fact] [ConditionalFact]
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/8267
public async Task ChangeExcludedFile() public async Task ChangeExcludedFile()
{ {
await _app.StartWatcherAsync(); await _app.StartWatcherAsync();
@ -97,7 +102,8 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
Assert.NotSame(restart, finished); Assert.NotSame(restart, finished);
} }
[Fact] [ConditionalFact]
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/8267
public async Task ListsFiles() public async Task ListsFiles()
{ {
await _app.PrepareAsync(); await _app.PrepareAsync();

7
src/Tools/dotnet-watch/test/NoDepsAppTests.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Testing.xunit;
using Xunit; using Xunit;
using Xunit.Abstractions; using Xunit.Abstractions;
@ -23,7 +24,8 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
_output = logger; _output = logger;
} }
[Fact] [ConditionalFact]
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/8267
public async Task RestartProcessOnFileChange() public async Task RestartProcessOnFileChange()
{ {
await _app.StartWatcherAsync(new[] { "--no-exit" }); await _app.StartWatcherAsync(new[] { "--no-exit" });
@ -41,7 +43,8 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
Assert.NotEqual(processIdentifier, processIdentifier2); Assert.NotEqual(processIdentifier, processIdentifier2);
} }
[Fact] [ConditionalFact]
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/8267
public async Task RestartProcessThatTerminatesAfterFileChange() public async Task RestartProcessThatTerminatesAfterFileChange()
{ {
await _app.StartWatcherAsync(); await _app.StartWatcherAsync();

3
src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj
View File

@ -5,12 +5,11 @@
<AssemblyName>Microsoft.DotNet.Watcher.Tools.Tests</AssemblyName> <AssemblyName>Microsoft.DotNet.Watcher.Tools.Tests</AssemblyName>
<DefaultItemExcludes>$(DefaultItemExcludes);TestProjects\**\*</DefaultItemExcludes> <DefaultItemExcludes>$(DefaultItemExcludes);TestProjects\**\*</DefaultItemExcludes>
<TestGroupName>DotNetWatcherToolsTests</TestGroupName> <TestGroupName>DotNetWatcherToolsTests</TestGroupName>
<!-- https://github.com/aspnet/AspNetCore/issues/6549 -->
<BuildHelixPayload>false</BuildHelixPayload>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="$(ToolSharedSourceRoot)TestHelpers\**\*.cs" /> <Compile Include="$(ToolSharedSourceRoot)TestHelpers\**\*.cs" />
<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Content Include="TestProjects\**\*" CopyToOutputDirectory="PreserveNewest" /> <Content Include="TestProjects\**\*" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup> </ItemGroup>