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

[Identity] Fix flaky test (#12771)

This commit is contained in:
Javier Calvarro Nelson 2019-07-31 21:58:10 +02:00 committed by GitHub
parent 9e6924235e
commit 2969001a75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Identity/test/Identity.FunctionalTests/Bootstrap3Tests/UIFramewrokAttributeTest.cs
View File

@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests.Bootstrap3Tests
var hasV3Part = false; var hasV3Part = false;
var hasV4Part = false; var hasV4Part = false;
var factory = Factory.WithWebHostBuilder( var factory = Factory.WithWebHostBuilder(
whb => whb.UseStartup<Startup>().ConfigureServices( whb => whb.ConfigureServices(
services => services.AddMvc().ConfigureApplicationPartManager( services => services.AddMvc().ConfigureApplicationPartManager(
apm => (hasV3Part, hasV4Part) = (HasPart(apm, "V3"), HasPart(apm, "V4"))))); apm => (hasV3Part, hasV4Part) = (HasPart(apm, "V3"), HasPart(apm, "V4")))));

5
src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs
View File

@ -37,13 +37,10 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests
} }
public string BootstrapFrameworkVersion { get; set; } = "V4"; public string BootstrapFrameworkVersion { get; set; } = "V4";
private bool IsHelixCI => typeof(ServerFactory<,>).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
.Any(a => a.Key == "Microsoft.AspNetCore.Testing.IsHelixCI");
protected override IHostBuilder CreateHostBuilder() protected override IHostBuilder CreateHostBuilder()
{ {
Program.UseStartup = false; return Program.CreateHostBuilder(new[] { "--use-startup=false" });
return base.CreateHostBuilder();
} }
protected override void ConfigureWebHost(IWebHostBuilder builder) protected override void ConfigureWebHost(IWebHostBuilder builder)

5
src/Identity/testassets/Identity.DefaultUI.WebSite/Program.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.IO; using System.IO;
using System.Linq;
using System.Reflection; using System.Reflection;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
@ -17,13 +18,11 @@ namespace Identity.DefaultUI.WebSite
CreateHostBuilder(args).Build().Run(); CreateHostBuilder(args).Build().Run();
} }
public static bool UseStartup { get; set; } = true;
public static IHostBuilder CreateHostBuilder(string[] args) => public static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args) Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder => .ConfigureWebHostDefaults(webBuilder =>
{ {
if (UseStartup) if (!args.Contains("--use-startup=false"))
{ {
webBuilder.UseStartup<Startup>(); webBuilder.UseStartup<Startup>();
} }