Skip to content

Commit

Permalink
Skip and fix broken cross-plat tests.
Browse files Browse the repository at this point in the history
These tests will be reenabled as part of dotnet/aspnetcore#26612
  • Loading branch information
NTaylorMullen committed Oct 5, 2020
1 parent 975d46b commit f7718a9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Razor.LanguageServer.Common;
using Microsoft.AspNetCore.Razor.Test.Common;
using Microsoft.AspNetCore.Testing;
using Microsoft.CodeAnalysis.Razor;
using Moq;
using Xunit;
Expand Down Expand Up @@ -150,7 +151,9 @@ public async Task Handle_DuplicateMonitors_Noops()
Assert.Equal(0, detector.StopCount);
}

[Fact]
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)]
public async Task Handle_ChangedConfigurationOutputPath_StartsWithNewPath()
{
// Arrange
Expand Down Expand Up @@ -181,7 +184,9 @@ public async Task Handle_ChangedConfigurationOutputPath_StartsWithNewPath()
Assert.Equal(1, detector.StopCount);
}

[Fact]
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)]
public async Task Handle_ChangedConfigurationExternalToInternal_StopsWithoutRestarting()
{
// Arrange
Expand All @@ -194,7 +199,7 @@ public async Task Handle_ChangedConfigurationExternalToInternal_StopsWithoutRest
Enumerable.Empty<IProjectConfigurationFileChangeListener>());
var externalRequest = new MonitorProjectConfigurationFilePathParams()
{
ProjectFilePath = "C:\\dir\\project.csproj",
ProjectFilePath = "C:\\dir\\project.csproj",z
ConfigurationFilePath = "C:\\externaldir\\obj\\Debug\\project.razor.json",
};
var internalRequest = new MonitorProjectConfigurationFilePathParams()
Expand All @@ -212,7 +217,9 @@ public async Task Handle_ChangedConfigurationExternalToInternal_StopsWithoutRest
Assert.Equal(1, detector.StopCount);
}

[Fact]
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)]
public async Task Handle_MultipleProjects_StartedAndStopped()
{
// Arrange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ public void GetItem_RootedFilePath_BelongsToProject()
public void GetItem_RootedFilePath_DoesNotBelongToProject()
{
// Arrange
var fileSystem = new RemoteRazorProjectFileSystem("C:/path/to", FilePathNormalizer);
var documentFilePath = "C:/otherpath/to/file.cshtml";
var fileSystem = new RemoteRazorProjectFileSystem("/C:/path/to", FilePathNormalizer);
var documentFilePath = "/C:/otherpath/to/file.cshtml";

// Act
var item = fileSystem.GetItem(documentFilePath, fileKind: null);
Expand Down

0 comments on commit f7718a9

Please sign in to comment.