mirror of
https://github.com/wiremock/WireMock.Net.git
synced 2026-04-22 08:48:46 +02:00
Use default resource cleaning behavior in test (#1316)
This commit is contained in:
committed by
GitHub
parent
8151119cca
commit
2a010dcd42
@@ -159,9 +159,7 @@ internal class Program
|
|||||||
private static async Task TestWindowsCopyAsync()
|
private static async Task TestWindowsCopyAsync()
|
||||||
{
|
{
|
||||||
var builder = new WireMockContainerBuilder()
|
var builder = new WireMockContainerBuilder()
|
||||||
.WithWatchStaticMappings(true)
|
.WithWatchStaticMappings(true);
|
||||||
.WithAutoRemove(true)
|
|
||||||
.WithCleanUp(true);
|
|
||||||
|
|
||||||
var container = builder.Build();
|
var container = builder.Build();
|
||||||
|
|
||||||
@@ -186,8 +184,6 @@ internal class Program
|
|||||||
var mappings = await adminClient.GetMappingsAsync();
|
var mappings = await adminClient.GetMappingsAsync();
|
||||||
Console.WriteLine("mappings = " + JsonConvert.SerializeObject(mappings, Formatting.Indented));
|
Console.WriteLine("mappings = " + JsonConvert.SerializeObject(mappings, Formatting.Indented));
|
||||||
|
|
||||||
await Task.Delay(1_000);
|
|
||||||
|
|
||||||
await container.StopAsync();
|
await container.StopAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -205,9 +201,7 @@ internal class Program
|
|||||||
.WithNetwork(dummyNetwork)
|
.WithNetwork(dummyNetwork)
|
||||||
.WithAdminUserNameAndPassword("x", "y")
|
.WithAdminUserNameAndPassword("x", "y")
|
||||||
.WithMappings(mappingsPath)
|
.WithMappings(mappingsPath)
|
||||||
.WithWatchStaticMappings(true)
|
.WithWatchStaticMappings(true);
|
||||||
// .WithAutoRemove(true)
|
|
||||||
.WithCleanUp(true);
|
|
||||||
|
|
||||||
if (image != null)
|
if (image != null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -25,8 +25,6 @@ public partial class TestcontainersTests
|
|||||||
var adminUsername = $"username_{Guid.NewGuid()}";
|
var adminUsername = $"username_{Guid.NewGuid()}";
|
||||||
var adminPassword = $"password_{Guid.NewGuid()}";
|
var adminPassword = $"password_{Guid.NewGuid()}";
|
||||||
var wireMockContainer = new WireMockContainerBuilder()
|
var wireMockContainer = new WireMockContainerBuilder()
|
||||||
.WithAutoRemove(true)
|
|
||||||
.WithCleanUp(true)
|
|
||||||
.WithAdminUserNameAndPassword(adminUsername, adminPassword)
|
.WithAdminUserNameAndPassword(adminUsername, adminPassword)
|
||||||
.WithCommand("--UseHttp2")
|
.WithCommand("--UseHttp2")
|
||||||
.WithCommand("--Urls", "http://*:80 grpc://*:9090")
|
.WithCommand("--Urls", "http://*:80 grpc://*:9090")
|
||||||
@@ -80,8 +78,6 @@ public partial class TestcontainersTests
|
|||||||
var adminUsername = $"username_{Guid.NewGuid()}";
|
var adminUsername = $"username_{Guid.NewGuid()}";
|
||||||
var adminPassword = $"password_{Guid.NewGuid()}";
|
var adminPassword = $"password_{Guid.NewGuid()}";
|
||||||
var wireMockContainer = new WireMockContainerBuilder()
|
var wireMockContainer = new WireMockContainerBuilder()
|
||||||
.WithAutoRemove(true)
|
|
||||||
.WithCleanUp(true)
|
|
||||||
.WithAdminUserNameAndPassword(adminUsername, adminPassword)
|
.WithAdminUserNameAndPassword(adminUsername, adminPassword)
|
||||||
.AddUrl("http://*:8080")
|
.AddUrl("http://*:8080")
|
||||||
.AddUrl("grpc://*:9090")
|
.AddUrl("grpc://*:9090")
|
||||||
@@ -156,8 +152,6 @@ public partial class TestcontainersTests
|
|||||||
private static async Task<WireMockContainer> Given_WireMockContainerIsStartedForHttpAndGrpcAsync()
|
private static async Task<WireMockContainer> Given_WireMockContainerIsStartedForHttpAndGrpcAsync()
|
||||||
{
|
{
|
||||||
var wireMockContainer = new WireMockContainerBuilder()
|
var wireMockContainer = new WireMockContainerBuilder()
|
||||||
.WithAutoRemove(true)
|
|
||||||
.WithCleanUp(true)
|
|
||||||
.AddUrl("grpc://*:9090")
|
.AddUrl("grpc://*:9090")
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
@@ -169,8 +163,6 @@ public partial class TestcontainersTests
|
|||||||
private static async Task<WireMockContainer> Given_WireMockContainerWithProtoDefinitionAtServerLevelIsStartedForHttpAndGrpcAsync()
|
private static async Task<WireMockContainer> Given_WireMockContainerWithProtoDefinitionAtServerLevelIsStartedForHttpAndGrpcAsync()
|
||||||
{
|
{
|
||||||
var wireMockContainer = new WireMockContainerBuilder()
|
var wireMockContainer = new WireMockContainerBuilder()
|
||||||
.WithAutoRemove(true)
|
|
||||||
.WithCleanUp(true)
|
|
||||||
.AddUrl("grpc://*:9090")
|
.AddUrl("grpc://*:9090")
|
||||||
.AddProtoDefinition("my-greeter", ReadFile("greet.proto"))
|
.AddProtoDefinition("my-greeter", ReadFile("greet.proto"))
|
||||||
.Build();
|
.Build();
|
||||||
|
|||||||
@@ -24,8 +24,6 @@ public partial class TestcontainersTests(ITestOutputHelper testOutputHelper)
|
|||||||
var adminUsername = $"username_{Guid.NewGuid()}";
|
var adminUsername = $"username_{Guid.NewGuid()}";
|
||||||
var adminPassword = $"password_{Guid.NewGuid()}";
|
var adminPassword = $"password_{Guid.NewGuid()}";
|
||||||
var wireMockContainer = new WireMockContainerBuilder()
|
var wireMockContainer = new WireMockContainerBuilder()
|
||||||
.WithAutoRemove(true)
|
|
||||||
.WithCleanUp(true)
|
|
||||||
.WithAdminUserNameAndPassword(adminUsername, adminPassword)
|
.WithAdminUserNameAndPassword(adminUsername, adminPassword)
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
@@ -40,14 +38,11 @@ public partial class TestcontainersTests(ITestOutputHelper testOutputHelper)
|
|||||||
// Act
|
// Act
|
||||||
var dummyNetwork = new NetworkBuilder()
|
var dummyNetwork = new NetworkBuilder()
|
||||||
.WithName("Dummy Network for TestcontainersTests")
|
.WithName("Dummy Network for TestcontainersTests")
|
||||||
.WithCleanUp(true)
|
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
var wireMockContainer = new WireMockContainerBuilder()
|
var wireMockContainer = new WireMockContainerBuilder()
|
||||||
.WithNetwork(dummyNetwork)
|
.WithNetwork(dummyNetwork)
|
||||||
.WithWatchStaticMappings(true)
|
.WithWatchStaticMappings(true)
|
||||||
.WithAutoRemove(true)
|
|
||||||
.WithCleanUp(true)
|
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
await StartTestAsync(wireMockContainer);
|
await StartTestAsync(wireMockContainer);
|
||||||
@@ -61,8 +56,6 @@ public partial class TestcontainersTests(ITestOutputHelper testOutputHelper)
|
|||||||
var adminUsername = $"username_{Guid.NewGuid()}";
|
var adminUsername = $"username_{Guid.NewGuid()}";
|
||||||
var adminPassword = $"password_{Guid.NewGuid()}";
|
var adminPassword = $"password_{Guid.NewGuid()}";
|
||||||
var wireMockContainerBuilder = new WireMockContainerBuilder()
|
var wireMockContainerBuilder = new WireMockContainerBuilder()
|
||||||
.WithAutoRemove(true)
|
|
||||||
.WithCleanUp(true)
|
|
||||||
.WithAdminUserNameAndPassword(adminUsername, adminPassword);
|
.WithAdminUserNameAndPassword(adminUsername, adminPassword);
|
||||||
|
|
||||||
var imageOS = await TestcontainersUtils.GetImageOSAsync.Value;
|
var imageOS = await TestcontainersUtils.GetImageOSAsync.Value;
|
||||||
@@ -88,8 +81,6 @@ public partial class TestcontainersTests(ITestOutputHelper testOutputHelper)
|
|||||||
var adminUsername = $"username_{Guid.NewGuid()}";
|
var adminUsername = $"username_{Guid.NewGuid()}";
|
||||||
var adminPassword = $"password_{Guid.NewGuid()}";
|
var adminPassword = $"password_{Guid.NewGuid()}";
|
||||||
var wireMockContainerBuilder = new WireMockContainerBuilder()
|
var wireMockContainerBuilder = new WireMockContainerBuilder()
|
||||||
.WithAutoRemove(true)
|
|
||||||
.WithCleanUp(true)
|
|
||||||
.WithAdminUserNameAndPassword(adminUsername, adminPassword);
|
.WithAdminUserNameAndPassword(adminUsername, adminPassword);
|
||||||
|
|
||||||
var imageOS = await TestcontainersUtils.GetImageOSAsync.Value;
|
var imageOS = await TestcontainersUtils.GetImageOSAsync.Value;
|
||||||
|
|||||||
Reference in New Issue
Block a user