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

Fix tests (#101)

This commit is contained in:
Pavel Krymets 2017-09-01 14:58:24 -07:00 committed by GitHub
parent fbacee2621
commit 3c58fde9a4
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.AzureAppServices.TestBundle/Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj
View File

@ -24,7 +24,7 @@
<Content Include="install.cmd" /> <Content Include="install.cmd" />
<Content Include="dotnet.cmd" /> <Content Include="dotnet.cmd" />
<Content Include="$(OutputPath)\Microsoft.Web.Xdt.Extensions.dll" PackagePath="content" /> <Content Include="$(OutputPath)\Microsoft.Web.Xdt.Extensions.dll" PackagePath="content" />
<Content Include="$(DotnetHomeDirectory)**\*.*" Exclude="$(DotnetHomeDirectory)**\nuGetPackagesArchive.lzma" Condition="$(DotnetHomeDirectory) != ''" PackagePath="content\%(RecursiveDir)%(FileName)%(Extension)" /> <Content Include="$(DotnetHomeDirectory)**\*.*" Condition="$(DotnetHomeDirectory) != ''" PackagePath="content\%(RecursiveDir)%(FileName)%(Extension)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/Microsoft.AspNetCore.AzureAppServices.TestBundle/applicationHost.xdt
View File

@ -7,7 +7,7 @@
<system.webServer xdt:Transform="InsertIfMissing"> <system.webServer xdt:Transform="InsertIfMissing">
<runtime xdt:Transform="InsertIfMissing" > <runtime xdt:Transform="InsertIfMissing" >
<environmentVariables xdt:Transform="InsertIfMissing"> <environmentVariables xdt:Transform="InsertIfMissing">
<add name="PATH" value="%XDT_EXTENSIONPATH%" xdt:Locator="Match(name)" xdt:Transform="InsertOrAppendAttribute(Attribute='value')" /> <add name="PATH" value="%XDT_EXTENSIONPATH%;%PATH%" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
</environmentVariables> </environmentVariables>
</runtime> </runtime>
</system.webServer> </system.webServer>

3
src/Microsoft.AspNetCore.AzureAppServices.TestBundle/install.cmd
View File

@ -12,5 +12,8 @@ robocopy "%DOTNET%" "." /E /XC /XN /XO /NFL /NDL ^
copy /y dotnet.cmd D:\home\site\deployments\tools copy /y dotnet.cmd D:\home\site\deployments\tools
rem force first time experience
dotnet msbuild /version
if %errorlevel% geq 8 exit /b 1 if %errorlevel% geq 8 exit /b 1
exit /b 0 exit /b 0

14
test/Microsoft.AspNetCore.AzureAppServices.FunctionalTests/TemplateFunctionalTests.cs
View File

@ -143,17 +143,17 @@ namespace Microsoft.AspNetCore.AzureAppServices.FunctionalTests
await dotnet.ExecuteAndAssertAsync("new " + template); await dotnet.ExecuteAndAssertAsync("new " + template);
// We don't ship offline cache in site extension so we need to provider a feed to
// restore from when doing kudu git deploy for version not published to Nuget
if (deploymentKind == WebAppDeploymentKind.Git && dotnetVersion == "latest")
{
CopyToProjectDirectory(testDirectory, Asset("Nuget.latest.config"), "NuGet.config");
}
InjectMiddlware(testDirectory, RuntimeInformationMiddlewareType, RuntimeInformationMiddlewareFile); InjectMiddlware(testDirectory, RuntimeInformationMiddlewareType, RuntimeInformationMiddlewareFile);
FixAspNetCoreVersion(testDirectory, dotnet.Command); FixAspNetCoreVersion(testDirectory, dotnet.Command);
var site = await siteTask; var site = await siteTask;
// There is no feed with packages included in lastes so we have to enable first run experience
if (deploymentKind == WebAppDeploymentKind.Git && dotnetVersion == "latest")
{
await site.Update().WithAppSetting("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "false").ApplyAsync();
}
await site.Deploy(deploymentKind, testDirectory, dotnet, logger); await site.Deploy(deploymentKind, testDirectory, dotnet, logger);
using (var httpClient = site.CreateClient()) using (var httpClient = site.CreateClient())

1
test/Microsoft.AspNetCore.AzureAppServices.FunctionalTests/WebAppExtensions.cs
View File

@ -106,6 +106,7 @@ namespace Microsoft.AspNetCore.AzureAppServices.FunctionalTests
var result = await git.ExecuteAndAssertAsync("push origin master"); var result = await git.ExecuteAndAssertAsync("push origin master");
Assert.DoesNotContain("An error has occurred during web site deployment", result.StdErr); Assert.DoesNotContain("An error has occurred during web site deployment", result.StdErr);
Assert.DoesNotContain("deployment to website failed", result.StdErr);
} }
public static async Task BuildPublishProfileAsync(this IWebApp site, string projectDirectory) public static async Task BuildPublishProfileAsync(this IWebApp site, string projectDirectory)