try fix failing tests

Author: StuartFerguson

SecurityService.OpenIdConnect.IntegrationTests/Common/DockerHelper.cs

@@ -1,5 +1,6 @@
 using System.Runtime.InteropServices;
 using DotNet.Testcontainers.Builders;
+using DotNet.Testcontainers.Configurations;
 using DotNet.Testcontainers.Containers;
 using DotNet.Testcontainers.Networks;
 using Shared.IntegrationTesting.TestContainers;
@@ -84,7 +85,7 @@ public override async Task CreateSubscriptions(){
         /// <param name="scenarioName">Name of the scenario.</param>
         public override async Task StartContainersForScenarioRun(String scenarioName, DockerServices dockerServices)
         {
-            this.Trace($"Test Id is {this.TestId} and Scenrio {scenarioName}");
+            this.Trace($"Test Id is {this.TestId} and Scenario {scenarioName}");
 
             await base.StartContainersForScenarioRun(scenarioName,dockerServices);
 
@@ -94,11 +95,6 @@ public override async Task StartContainersForScenarioRun(String scenarioName, Do
 
             this.SecurityServiceClient = new SecurityServiceClient(securityServiceBaseAddressResolver, httpClient);
 
-            //this.Containers.AddRange(new List<IContainerService>
-            //                         {
-            //                             securityServiceTestUIContainer
-            //                         });
-
             DockerHelper.AddEntryToHostsFile("127.0.0.1", SecurityServiceContainerName);
             DockerHelper.AddEntryToHostsFile("localhost", SecurityServiceContainerName);
         }
@@ -138,6 +134,10 @@ protected async Task StartContainer(Func<ContainerBuilder> buildContainerFunc, L
 
                 this.SecurityServiceTestUIPort = builtContainer.GetMappedPublicPort(5004);
 
+                this.Containers.AddRange(new List<(DockerServices, IContainer)> {
+                    (DockerServices.None,builtContainer)
+                });
+
                 await this.DoTestUIHealthCheck();
             }
             catch (Exception ex)
@@ -203,15 +203,15 @@ private ContainerBuilder SetupSecurityServiceTestUIContainer(){
             environmentVariables.Add($"AppSettings:Authority",$"https://identity-server:{this.SecurityServicePort}");
             environmentVariables.Add($"AppSettings:ClientId",clientDetails.Item1);
             environmentVariables.Add($"AppSettings:ClientSecret",clientDetails.Item2);
-            environmentVariables.Add("urls","https://*:5004");
+            //environmentVariables.Add("urls","https://*:5004");
             environmentVariables.Add("Logging:LogLevel:Microsoft","Information");
             environmentVariables.Add("Logging:LogLevel:Default","Information");
             environmentVariables.Add("Logging:EventLog:LogLevel:Default","None");
 
 
 
             ContainerBuilder securityServiceTestUIContainer = new ContainerBuilder().WithName(this.SecurityServiceTestUIContainerName)
-                .WithEnvironment(environmentVariables).WithImage("securityservicetestui").WithPortBinding(5004);
+                .WithEnvironment(environmentVariables).WithImage("securityservicetestui").WithPortBinding(5004, true);
 
             return securityServiceTestUIContainer;
         }

SecurityService.OpenIdConnect.IntegrationTests/Common/GenericSteps.cs

@@ -58,7 +58,7 @@ public async Task StartSystem()
 
         [AfterScenario]
         public async Task StopSystem(){
-            DockerServices sharedDockerServices = DockerServices.SqlServer;
+            DockerServices sharedDockerServices = DockerServices.None;
             this.TestingContext.DockerHelper.Logger.LogInformation("About to Stop Containers for Scenario Run");
             await this.TestingContext.DockerHelper.StopContainersForScenarioRun(sharedDockerServices).ConfigureAwait(false);
             this.TestingContext.DockerHelper.Logger.LogInformation("Containers for Scenario Run Stopped");