From e7385788b72f34846c87f0efb6c8a45f8f6f168b Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Fri, 28 Jun 2019 10:08:29 -0700 Subject: [PATCH] Unskip work template test #7974 (#11658) --- src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 | 12 ++++++++++++ src/ProjectTemplates/test/Helpers/Project.cs | 8 ++++---- src/ProjectTemplates/test/WorkerTemplateTest.cs | 6 +++--- 3 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 diff --git a/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 new file mode 100644 index 0000000000..867750b6e9 --- /dev/null +++ b/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 @@ -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 diff --git a/src/ProjectTemplates/test/Helpers/Project.cs b/src/ProjectTemplates/test/Helpers/Project.cs index 448221a6cf..a03abf07bc 100644 --- a/src/ProjectTemplates/test/Helpers/Project.cs +++ b/src/ProjectTemplates/test/Helpers/Project.cs @@ -179,7 +179,7 @@ namespace Templates.Test.Helpers return new AspNetProcess(Output, TemplateClientReleaseDir, projectDll, environment); } - internal AspNetProcess StartBuiltProjectAsync() + internal AspNetProcess StartBuiltProjectAsync(bool hasListeningUri = true) { var environment = new Dictionary { @@ -188,10 +188,10 @@ namespace Templates.Test.Helpers }; 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 { @@ -199,7 +199,7 @@ namespace Templates.Test.Helpers }; var projectDll = $"{ProjectName}.dll"; - return new AspNetProcess(Output, TemplatePublishDir, projectDll, environment); + return new AspNetProcess(Output, TemplatePublishDir, projectDll, environment, hasListeningUri: hasListeningUri); } internal async Task RestoreWithRetryAsync(ITestOutputHelper output, string workingDirectory) diff --git a/src/ProjectTemplates/test/WorkerTemplateTest.cs b/src/ProjectTemplates/test/WorkerTemplateTest.cs index b66672c7d8..57473127ba 100644 --- a/src/ProjectTemplates/test/WorkerTemplateTest.cs +++ b/src/ProjectTemplates/test/WorkerTemplateTest.cs @@ -20,7 +20,7 @@ namespace Templates.Test public ProjectFactoryFixture ProjectFactory { get; } public ITestOutputHelper Output { get; } - [Fact(Skip = "Microsoft.NET.Sdk.Worker isn't available yet")] + [Fact] public async Task WorkerTemplateAsync() { Project = await ProjectFactory.GetOrCreateProject("worker", Output); @@ -38,14 +38,14 @@ namespace Templates.Test var buildResult = await Project.RunDotNetBuildAsync(); Assert.True(0 == buildResult.ExitCode, ErrorMessages.GetFailedProcessMessage("build", Project, buildResult)); - using (var aspNetProcess = Project.StartBuiltProjectAsync()) + using (var aspNetProcess = Project.StartBuiltProjectAsync(hasListeningUri: false)) { Assert.False( aspNetProcess.Process.HasExited, ErrorMessages.GetFailedProcessMessageOrEmpty("Run built project", Project, aspNetProcess.Process)); } - using (var aspNetProcess = Project.StartPublishedProjectAsync()) + using (var aspNetProcess = Project.StartPublishedProjectAsync(hasListeningUri: false)) { Assert.False( aspNetProcess.Process.HasExited,