Skip to content

[Helix] Enable Hosting/DefautBuilder/ServerComparison.FunctionalTests #8248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

[Helix] Enable Hosting/DefautBuilder/ServerComparison.FunctionalTests #8248

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec0df9c
Enable helix for Hosting.FunctionalTests
HaoK Mar 6, 2019
a0b50ba
Enable ServerComparison.Functional tests
HaoK Mar 8, 2019
c1ffe09
Enable default builder
HaoK Mar 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<!-- https://github.com/aspnet/AspNetCore/issues/6549 -->
<BuildHelixPayload>false</BuildHelixPayload>
</PropertyGroup>

<ItemGroup>
<Content Include="testroot\**\*" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
<HelixContent Include="..\testassets\**\*" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should compile on helix machines. We should instead try to generalize using pre-published assets.
See #7027

<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/Hosting/test/FunctionalTests/WebHostBuilderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -28,7 +29,8 @@ public async Task InjectedStartup_DefaultApplicationNameIsEntryAssembly(TestVari
{
var logger = loggerFactory.CreateLogger(nameof(InjectedStartup_DefaultApplicationNameIsEntryAssembly));

var applicationPath = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("Hosting"), "test", "testassets", "IStartupInjectionAssemblyName");
var baseDirectory = SkipOnHelixAttribute.OnHelix() ? AppContext.BaseDirectory : Path.Combine(TestPathUtilities.GetSolutionRootDirectory("Hosting"), "test", "testassets");
Copy link
Member

@Tratcher Tratcher Mar 6, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Calling the skip attribute as a helper library? 👃

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah need a centralized helper for sure, the universe of these tests that need to do different stuff on helix will drive that, its in a shared source file for now, so it was easiest to just expose it there as a starting point. Note: I'm just opening these PRs as starting points for the feature teams to be investigate. These are 'repro' PRs

var applicationPath = Path.Combine(baseDirectory, "IStartupInjectionAssemblyName");

var deploymentParameters = new DeploymentParameters(variant)
{
Expand Down