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

WIP

This commit is contained in:
Ryan Nowak 2018-01-12 15:17:16 -08:00
parent f025a27f04
commit 2555c5bab1
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/Assert.cs
View File

@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
continue;
}
if (location != null && match.Groups["location"].Value != location)
if (location != null && match.Groups["location"].Value.Trim() != location)
{
continue;
}
@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
}
}
throw new BuildErrorMissingException(result, errorCode);
throw new BuildErrorMissingException(result, errorCode, location);
}
public static void BuildFailed(MSBuildResult result)
@ -248,15 +248,26 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
private class BuildErrorMissingException : MSBuildXunitException
{
public BuildErrorMissingException(MSBuildResult result, string errorCode)
public BuildErrorMissingException(MSBuildResult result, string errorCode, string location)
: base(result)
{
ErrorCode = errorCode;
Location = location;
}
public string ErrorCode { get; }
protected override string Heading => $"Error code '{ErrorCode}' was not found.";
public string Location { get; }
protected override string Heading
{
get
{
return
$"Error code '{ErrorCode}' was not found." + Environment.NewLine +
$"Looking for '{Location ?? ".*"}: error {ErrorCode}: .*'";
}
}
}

2
test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/MSBuildProcessManager.cs
View File

@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
TimeSpan? timeout = null,
MSBuildProcessKind msBuildProcessKind = MSBuildProcessKind.Dotnet)
{
timeout = timeout ?? TimeSpan.FromSeconds(30);
timeout = timeout ?? TimeSpan.FromSeconds(60);
var processStartInfo = new ProcessStartInfo()
{