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

Unskip work template test #7974 (#11658)

This commit is contained in:
Chris Ross 2019-06-28 10:08:29 -07:00 committed by GitHub
parent 1c71752b1f
commit e7385788b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 Normal file
View File

@ -0,0 +1,12 @@
#!/usr/bin/env pwsh
#requires -version 4
[CmdletBinding(PositionalBinding = $false)]
param()
Set-StrictMode -Version 2
$ErrorActionPreference = 'Stop'
. $PSScriptRoot\Test-Template.ps1
Test-Template "worker" "worker" "Microsoft.DotNet.Web.ProjectTemplates.3.0.3.0.0-dev.nupkg" $false

8
src/ProjectTemplates/test/Helpers/Project.cs
View File

@ -179,7 +179,7 @@ namespace Templates.Test.Helpers
return new AspNetProcess(Output, TemplateClientReleaseDir, projectDll, environment); return new AspNetProcess(Output, TemplateClientReleaseDir, projectDll, environment);
} }
internal AspNetProcess StartBuiltProjectAsync() internal AspNetProcess StartBuiltProjectAsync(bool hasListeningUri = true)
{ {
var environment = new Dictionary<string, string> var environment = new Dictionary<string, string>
{ {
@ -188,10 +188,10 @@ namespace Templates.Test.Helpers
}; };
var projectDll = Path.Combine(TemplateBuildDir, $"{ProjectName}.dll"); var projectDll = Path.Combine(TemplateBuildDir, $"{ProjectName}.dll");
return new AspNetProcess(Output, TemplateOutputDir, projectDll, environment); return new AspNetProcess(Output, TemplateOutputDir, projectDll, environment, hasListeningUri: hasListeningUri);
} }
internal AspNetProcess StartPublishedProjectAsync() internal AspNetProcess StartPublishedProjectAsync(bool hasListeningUri = true)
{ {
var environment = new Dictionary<string, string> var environment = new Dictionary<string, string>
{ {
@ -199,7 +199,7 @@ namespace Templates.Test.Helpers
}; };
var projectDll = $"{ProjectName}.dll"; var projectDll = $"{ProjectName}.dll";
return new AspNetProcess(Output, TemplatePublishDir, projectDll, environment); return new AspNetProcess(Output, TemplatePublishDir, projectDll, environment, hasListeningUri: hasListeningUri);
} }
internal async Task<ProcessEx> RestoreWithRetryAsync(ITestOutputHelper output, string workingDirectory) internal async Task<ProcessEx> RestoreWithRetryAsync(ITestOutputHelper output, string workingDirectory)

6
src/ProjectTemplates/test/WorkerTemplateTest.cs
View File

@ -20,7 +20,7 @@ namespace Templates.Test
public ProjectFactoryFixture ProjectFactory { get; } public ProjectFactoryFixture ProjectFactory { get; }
public ITestOutputHelper Output { get; } public ITestOutputHelper Output { get; }
[Fact(Skip = "Microsoft.NET.Sdk.Worker isn't available yet")] [Fact]
public async Task WorkerTemplateAsync() public async Task WorkerTemplateAsync()
{ {
Project = await ProjectFactory.GetOrCreateProject("worker", Output); Project = await ProjectFactory.GetOrCreateProject("worker", Output);
@ -38,14 +38,14 @@ namespace Templates.Test
var buildResult = await Project.RunDotNetBuildAsync(); var buildResult = await Project.RunDotNetBuildAsync();
Assert.True(0 == buildResult.ExitCode, ErrorMessages.GetFailedProcessMessage("build", Project, buildResult)); Assert.True(0 == buildResult.ExitCode, ErrorMessages.GetFailedProcessMessage("build", Project, buildResult));
using (var aspNetProcess = Project.StartBuiltProjectAsync()) using (var aspNetProcess = Project.StartBuiltProjectAsync(hasListeningUri: false))
{ {
Assert.False( Assert.False(
aspNetProcess.Process.HasExited, aspNetProcess.Process.HasExited,
ErrorMessages.GetFailedProcessMessageOrEmpty("Run built project", Project, aspNetProcess.Process)); ErrorMessages.GetFailedProcessMessageOrEmpty("Run built project", Project, aspNetProcess.Process));
} }
using (var aspNetProcess = Project.StartPublishedProjectAsync()) using (var aspNetProcess = Project.StartPublishedProjectAsync(hasListeningUri: false))
{ {
Assert.False( Assert.False(
aspNetProcess.Process.HasExited, aspNetProcess.Process.HasExited,