From 6861e1dbc3d5a022647cd696c2472bae088380c2 Mon Sep 17 00:00:00 2001 From: Andre Hofmeister <9199345+HofmeisterAn@users.noreply.github.com> Date: Sat, 13 Jan 2024 11:32:51 +0100 Subject: [PATCH 1/2] chore: Update xUnit.net --- Packages.props | 4 +- examples/Flyway/Packages.props | 6 +- examples/WeatherForecast/Packages.props | 6 +- .../ArtemisContainerTest.cs | 18 ++--- .../Testcontainers.ActiveMq.Tests.csproj | 4 +- .../ArangoDbContainerTest.cs | 2 +- .../Testcontainers.ArangoDb.Tests.csproj | 4 +- .../AzuriteContainerTest.cs | 8 +-- .../Testcontainers.Azurite.Tests.csproj | 4 +- .../BigQueryContainerTest.cs | 10 +-- .../Testcontainers.BigQuery.Tests.csproj | 4 +- .../BigtableContainerTest.cs | 6 +- .../Testcontainers.Bigtable.Tests.csproj | 4 +- .../ClickHouseContainerTest.cs | 2 +- .../Testcontainers.ClickHouse.Tests.csproj | 4 +- .../ConsulContainerTest.cs | 4 +- .../Testcontainers.Consul.Tests.csproj | 4 +- .../CosmosDbContainerTest.cs | 2 +- .../Testcontainers.CosmosDb.Tests.csproj | 4 +- .../CouchDbContainerTest.cs | 2 +- .../Testcontainers.CouchDb.Tests.csproj | 4 +- .../CouchbaseContainerTest.cs | 6 +- .../Testcontainers.Couchbase.Tests.csproj | 4 +- .../Testcontainers.Databases.Tests.csproj | 4 +- .../DynamoDbContainerTest.cs | 8 +-- .../Testcontainers.DynamoDb.Tests.csproj | 4 +- .../Testcontainers.Elasticsearch.Tests.csproj | 4 +- .../EventStoreDbContainerTest.cs | 4 +- .../Testcontainers.EventStoreDb.Tests.csproj | 4 +- .../FakeGcsServerContainerTest.cs | 8 +-- .../Testcontainers.FakeGcsServer.Tests.csproj | 4 +- .../FirebirdSqlContainerTest.cs | 2 +- .../Testcontainers.FirebirdSql.Tests.csproj | 4 +- .../FirestoreContainerTest.cs | 6 +- .../Testcontainers.Firestore.Tests.csproj | 4 +- .../InfluxDbContainerTest.cs | 6 +- .../Testcontainers.InfluxDb.Tests.csproj | 4 +- .../JanusGraphContainerTest.cs | 4 +- .../Testcontainers.JanusGraph.Tests.csproj | 4 +- .../K3sContainerTest.cs | 8 +-- .../Testcontainers.K3s.Tests.csproj | 4 +- .../KafkaContainerTest.cs | 21 +++--- .../Testcontainers.Kafka.Tests.csproj | 4 +- .../KeycloakContainerTest.cs | 4 +- .../Testcontainers.Keycloak.Tests.csproj | 4 +- .../KustoContainerTest.cs | 2 +- .../Testcontainers.Kusto.Tests.csproj | 4 +- .../LocalStackContainerTest.cs | 14 ++-- .../Testcontainers.LocalStack.Tests.csproj | 4 +- .../MariaDbContainerTest.cs | 2 +- .../Testcontainers.MariaDb.Tests.csproj | 4 +- .../MinioContainerTest.cs | 8 +-- .../Testcontainers.Minio.Tests.csproj | 4 +- .../MongoDbContainerTest.cs | 2 +- .../Testcontainers.MongoDb.Tests.csproj | 4 +- .../MsSqlContainerTest.cs | 2 +- .../Testcontainers.MsSql.Tests.csproj | 4 +- .../MySqlContainerTest.cs | 2 +- .../Testcontainers.MySql.Tests.csproj | 4 +- .../NatsContainerTest.cs | 4 +- .../Testcontainers.Nats.Tests.csproj | 4 +- .../Testcontainers.Neo4j.Tests.csproj | 4 +- .../OracleContainerTest.cs | 2 +- .../Testcontainers.Oracle.Tests.csproj | 4 +- .../PapercutContainerTest.cs | 2 +- .../Testcontainers.Papercut.Tests.csproj | 4 +- .../DependsOnTest.cs | 6 +- .../PortForwardingTest.cs | 4 +- .../TarOutputMemoryStreamTest.cs | 12 ++-- ...Testcontainers.Platform.Linux.Tests.csproj | 4 +- ...stcontainers.Platform.Windows.Tests.csproj | 4 +- .../PostgreSqlContainerTest.cs | 2 +- .../Testcontainers.PostgreSql.Tests.csproj | 4 +- .../PubSubContainerTest.cs | 14 ++-- .../Testcontainers.PubSub.Tests.csproj | 4 +- .../Testcontainers.RabbitMq.Tests.csproj | 4 +- .../Testcontainers.RavenDb.Tests.csproj | 4 +- .../RedisContainerTest.cs | 2 +- .../Testcontainers.Redis.Tests.csproj | 4 +- .../RedpandaContainerTest.cs | 21 +++--- .../Testcontainers.Redpanda.Tests.csproj | 4 +- .../DefaultResourceReaperTest.cs | 4 +- .../Testcontainers.SqlEdge.Tests.csproj | 4 +- .../Configurations/ResourcePropertiesTest.cs | 18 ++--- .../TestcontainersWaitStrategyTest.cs | 4 +- .../WaitUntilContainerIsHealthyTest.cs | 4 +- .../WaitUntilFileExistsInContainerTest.cs | 2 +- .../WaitUntilHttpRequestIsSucceededTest.cs | 18 ++--- .../WaitUntilOperationIsSucceededTest.cs | 4 +- .../Containers/Unix/GetContainerLogsTest.cs | 6 +- .../Unix/ProtectDockerDaemonSocketTest.cs | 6 +- .../Unix/ReadFileFromContainerTest.cs | 4 +- ...TestcontainersContainerCancellationTest.cs | 2 +- .../Unix/TestcontainersContainerTest.cs | 70 +++++++++---------- .../Unit/Images/ImageFromDockerfileTest.cs | 10 +-- .../TestcontainerNetworkBuilderTest.cs | 4 +- .../Networks/TestcontainersNetworkTest.cs | 2 +- .../TestcontainersVolumeBuilderTest.cs | 2 +- .../Testcontainers.WebDriver.Tests.csproj | 4 +- .../WebDriverContainerTest.cs | 4 +- 100 files changed, 287 insertions(+), 297 deletions(-) diff --git a/Packages.props b/Packages.props index 6fa7083e5..dfb211baa 100644 --- a/Packages.props +++ b/Packages.props @@ -12,7 +12,7 @@ - - + + diff --git a/examples/Flyway/Packages.props b/examples/Flyway/Packages.props index c96f1bbf2..acedd35de 100644 --- a/examples/Flyway/Packages.props +++ b/examples/Flyway/Packages.props @@ -2,10 +2,10 @@ - + - - + + \ No newline at end of file diff --git a/examples/WeatherForecast/Packages.props b/examples/WeatherForecast/Packages.props index 63980ebe4..da042a70c 100644 --- a/examples/WeatherForecast/Packages.props +++ b/examples/WeatherForecast/Packages.props @@ -5,14 +5,14 @@ - + - - + + diff --git a/tests/Testcontainers.ActiveMq.Tests/ArtemisContainerTest.cs b/tests/Testcontainers.ActiveMq.Tests/ArtemisContainerTest.cs index 973f9beb7..704e44f68 100644 --- a/tests/Testcontainers.ActiveMq.Tests/ArtemisContainerTest.cs +++ b/tests/Testcontainers.ActiveMq.Tests/ArtemisContainerTest.cs @@ -36,34 +36,34 @@ public async Task EstablishesConnection() // When using var connection = await connectionFactory.CreateConnectionAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); await connection.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); Assert.True(connection.IsStarted); // Then using var session = await connection.CreateSessionAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); using var queue = await session.CreateTemporaryQueueAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); using var producer = await session.CreateProducerAsync(queue) - .ConfigureAwait(false); + .ConfigureAwait(true); using var consumer = await session.CreateConsumerAsync(queue) - .ConfigureAwait(false); + .ConfigureAwait(true); var producedMessage = await producer.CreateTextMessageAsync(Guid.NewGuid().ToString("D")) - .ConfigureAwait(false); + .ConfigureAwait(true); await producer.SendAsync(producedMessage) - .ConfigureAwait(false); + .ConfigureAwait(true); var receivedMessage = await consumer.ReceiveAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); Assert.Equal(producedMessage.Text, receivedMessage.Body()); } diff --git a/tests/Testcontainers.ActiveMq.Tests/Testcontainers.ActiveMq.Tests.csproj b/tests/Testcontainers.ActiveMq.Tests/Testcontainers.ActiveMq.Tests.csproj index 71bcb5e8a..92295b251 100644 --- a/tests/Testcontainers.ActiveMq.Tests/Testcontainers.ActiveMq.Tests.csproj +++ b/tests/Testcontainers.ActiveMq.Tests/Testcontainers.ActiveMq.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.ArangoDb.Tests/ArangoDbContainerTest.cs b/tests/Testcontainers.ArangoDb.Tests/ArangoDbContainerTest.cs index 9d8c6a71e..358c252bb 100644 --- a/tests/Testcontainers.ArangoDb.Tests/ArangoDbContainerTest.cs +++ b/tests/Testcontainers.ArangoDb.Tests/ArangoDbContainerTest.cs @@ -27,7 +27,7 @@ public async Task RetrievesDatabases() // When var response = await client.Database.GetDatabasesAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(HttpStatusCode.OK, response.Code); diff --git a/tests/Testcontainers.ArangoDb.Tests/Testcontainers.ArangoDb.Tests.csproj b/tests/Testcontainers.ArangoDb.Tests/Testcontainers.ArangoDb.Tests.csproj index b66e4623e..72a55e856 100644 --- a/tests/Testcontainers.ArangoDb.Tests/Testcontainers.ArangoDb.Tests.csproj +++ b/tests/Testcontainers.ArangoDb.Tests/Testcontainers.ArangoDb.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Azurite.Tests/AzuriteContainerTest.cs b/tests/Testcontainers.Azurite.Tests/AzuriteContainerTest.cs index 7f99f2d59..127194ebe 100644 --- a/tests/Testcontainers.Azurite.Tests/AzuriteContainerTest.cs +++ b/tests/Testcontainers.Azurite.Tests/AzuriteContainerTest.cs @@ -28,7 +28,7 @@ public async Task EstablishesBlobServiceConnection() // When var properties = await client.GetPropertiesAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.False(HasError(properties)); @@ -43,7 +43,7 @@ public async Task EstablishesQueueServiceConnection() // When var properties = await client.GetPropertiesAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.False(HasError(properties)); @@ -58,7 +58,7 @@ public async Task EstablishesTableServiceConnection() // When var properties = await client.GetPropertiesAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.False(HasError(properties)); @@ -107,7 +107,7 @@ public async Task MemoryLimitIsConfigured() { // Given var (stdout, _) = await _azuriteContainer.GetLogsAsync(timestampsEnabled: false) - .ConfigureAwait(false); + .ConfigureAwait(true); // When var firstLine = stdout.Split(LineEndings, StringSplitOptions.RemoveEmptyEntries).First(); diff --git a/tests/Testcontainers.Azurite.Tests/Testcontainers.Azurite.Tests.csproj b/tests/Testcontainers.Azurite.Tests/Testcontainers.Azurite.Tests.csproj index 4b6e99cd1..16674b8d8 100644 --- a/tests/Testcontainers.Azurite.Tests/Testcontainers.Azurite.Tests.csproj +++ b/tests/Testcontainers.Azurite.Tests/Testcontainers.Azurite.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.BigQuery.Tests/BigQueryContainerTest.cs b/tests/Testcontainers.BigQuery.Tests/BigQueryContainerTest.cs index 0d8a72491..d06dcabd2 100644 --- a/tests/Testcontainers.BigQuery.Tests/BigQueryContainerTest.cs +++ b/tests/Testcontainers.BigQuery.Tests/BigQueryContainerTest.cs @@ -42,20 +42,20 @@ public async Task ExecuteQueryReturnsInsertRow() expectedRow.Add("score", 85L); using var bigQueryClient = await bigQueryClientBuilder.BuildAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); var dataset = await bigQueryClient.GetOrCreateDatasetAsync("mydata") - .ConfigureAwait(false); + .ConfigureAwait(true); // When var table = await dataset.CreateTableAsync("scores", tableSchema) - .ConfigureAwait(false); + .ConfigureAwait(true); _ = await table.InsertRowAsync(expectedRow) - .ConfigureAwait(false); + .ConfigureAwait(true); var results = await bigQueryClient.ExecuteQueryAsync($"SELECT * FROM {table}", null) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Single(results); diff --git a/tests/Testcontainers.BigQuery.Tests/Testcontainers.BigQuery.Tests.csproj b/tests/Testcontainers.BigQuery.Tests/Testcontainers.BigQuery.Tests.csproj index c1535b1a8..771f6240d 100644 --- a/tests/Testcontainers.BigQuery.Tests/Testcontainers.BigQuery.Tests.csproj +++ b/tests/Testcontainers.BigQuery.Tests/Testcontainers.BigQuery.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Bigtable.Tests/BigtableContainerTest.cs b/tests/Testcontainers.Bigtable.Tests/BigtableContainerTest.cs index d3034d1a9..daf192aee 100644 --- a/tests/Testcontainers.Bigtable.Tests/BigtableContainerTest.cs +++ b/tests/Testcontainers.Bigtable.Tests/BigtableContainerTest.cs @@ -43,13 +43,13 @@ public async Task GetTableReturnsCreateTable() // When var bigtableClient = await bigtableClientBuilder.BuildAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); _ = await bigtableClient.CreateTableAsync(instanceName, tableName.TableId, table) - .ConfigureAwait(false); + .ConfigureAwait(true); var actualTable = await bigtableClient.GetTableAsync(tableName) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.NotNull(actualTable); diff --git a/tests/Testcontainers.Bigtable.Tests/Testcontainers.Bigtable.Tests.csproj b/tests/Testcontainers.Bigtable.Tests/Testcontainers.Bigtable.Tests.csproj index d7b5c827c..7c9fdad69 100644 --- a/tests/Testcontainers.Bigtable.Tests/Testcontainers.Bigtable.Tests.csproj +++ b/tests/Testcontainers.Bigtable.Tests/Testcontainers.Bigtable.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.ClickHouse.Tests/ClickHouseContainerTest.cs b/tests/Testcontainers.ClickHouse.Tests/ClickHouseContainerTest.cs index f48af2f52..fde12cad5 100644 --- a/tests/Testcontainers.ClickHouse.Tests/ClickHouseContainerTest.cs +++ b/tests/Testcontainers.ClickHouse.Tests/ClickHouseContainerTest.cs @@ -37,7 +37,7 @@ public async Task ExecScriptReturnsSuccessful() // When var execResult = await _clickHouseContainer.ExecScriptAsync(scriptContent) - .ConfigureAwait(false); + .ConfigureAwait(true); // When Assert.True(0L.Equals(execResult.ExitCode), execResult.Stderr); diff --git a/tests/Testcontainers.ClickHouse.Tests/Testcontainers.ClickHouse.Tests.csproj b/tests/Testcontainers.ClickHouse.Tests/Testcontainers.ClickHouse.Tests.csproj index 918419125..ad244cdbb 100644 --- a/tests/Testcontainers.ClickHouse.Tests/Testcontainers.ClickHouse.Tests.csproj +++ b/tests/Testcontainers.ClickHouse.Tests/Testcontainers.ClickHouse.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Consul.Tests/ConsulContainerTest.cs b/tests/Testcontainers.Consul.Tests/ConsulContainerTest.cs index 14069bb85..403fc55cd 100644 --- a/tests/Testcontainers.Consul.Tests/ConsulContainerTest.cs +++ b/tests/Testcontainers.Consul.Tests/ConsulContainerTest.cs @@ -33,10 +33,10 @@ public async Task GetItemReturnsPutItem() // When _ = await consulClient.KV.Put(expected) - .ConfigureAwait(false); + .ConfigureAwait(true); var actual = await consulClient.KV.Get(key) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(HttpStatusCode.OK, actual.StatusCode); diff --git a/tests/Testcontainers.Consul.Tests/Testcontainers.Consul.Tests.csproj b/tests/Testcontainers.Consul.Tests/Testcontainers.Consul.Tests.csproj index 941aa8d66..3c88eca07 100644 --- a/tests/Testcontainers.Consul.Tests/Testcontainers.Consul.Tests.csproj +++ b/tests/Testcontainers.Consul.Tests/Testcontainers.Consul.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.CosmosDb.Tests/CosmosDbContainerTest.cs b/tests/Testcontainers.CosmosDb.Tests/CosmosDbContainerTest.cs index 6ad6ad1e2..16ee4f4ee 100644 --- a/tests/Testcontainers.CosmosDb.Tests/CosmosDbContainerTest.cs +++ b/tests/Testcontainers.CosmosDb.Tests/CosmosDbContainerTest.cs @@ -29,7 +29,7 @@ public async Task AccountPropertiesIdReturnsLocalhost() // When var accountProperties = await cosmosClient.ReadAccountAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal("localhost", accountProperties.Id); diff --git a/tests/Testcontainers.CosmosDb.Tests/Testcontainers.CosmosDb.Tests.csproj b/tests/Testcontainers.CosmosDb.Tests/Testcontainers.CosmosDb.Tests.csproj index da8f4490e..dbb9b7aac 100644 --- a/tests/Testcontainers.CosmosDb.Tests/Testcontainers.CosmosDb.Tests.csproj +++ b/tests/Testcontainers.CosmosDb.Tests/Testcontainers.CosmosDb.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.CouchDb.Tests/CouchDbContainerTest.cs b/tests/Testcontainers.CouchDb.Tests/CouchDbContainerTest.cs index f3738f397..3a7209b01 100644 --- a/tests/Testcontainers.CouchDb.Tests/CouchDbContainerTest.cs +++ b/tests/Testcontainers.CouchDb.Tests/CouchDbContainerTest.cs @@ -23,7 +23,7 @@ public async Task PutDatabaseReturnsHttpStatusCodeCreated() // When var database = await client.Database.PutAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(HttpStatusCode.Created, database.StatusCode); diff --git a/tests/Testcontainers.CouchDb.Tests/Testcontainers.CouchDb.Tests.csproj b/tests/Testcontainers.CouchDb.Tests/Testcontainers.CouchDb.Tests.csproj index 945c3b61f..4c776c8bb 100644 --- a/tests/Testcontainers.CouchDb.Tests/Testcontainers.CouchDb.Tests.csproj +++ b/tests/Testcontainers.CouchDb.Tests/Testcontainers.CouchDb.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Couchbase.Tests/CouchbaseContainerTest.cs b/tests/Testcontainers.Couchbase.Tests/CouchbaseContainerTest.cs index cc6e7741a..07304259c 100644 --- a/tests/Testcontainers.Couchbase.Tests/CouchbaseContainerTest.cs +++ b/tests/Testcontainers.Couchbase.Tests/CouchbaseContainerTest.cs @@ -25,14 +25,14 @@ public async Task GetBucketReturnsDefaultBucket() clusterOptions.Password = CouchbaseBuilder.DefaultPassword; var cluster = await Cluster.ConnectAsync(clusterOptions) - .ConfigureAwait(false); + .ConfigureAwait(true); // When var ping = await cluster.PingAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); var bucket = await cluster.BucketAsync(_couchbaseContainer.Buckets.Single().Name) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.NotEmpty(ping.Id); diff --git a/tests/Testcontainers.Couchbase.Tests/Testcontainers.Couchbase.Tests.csproj b/tests/Testcontainers.Couchbase.Tests/Testcontainers.Couchbase.Tests.csproj index 7c18af1b4..c8af0694a 100644 --- a/tests/Testcontainers.Couchbase.Tests/Testcontainers.Couchbase.Tests.csproj +++ b/tests/Testcontainers.Couchbase.Tests/Testcontainers.Couchbase.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Databases.Tests/Testcontainers.Databases.Tests.csproj b/tests/Testcontainers.Databases.Tests/Testcontainers.Databases.Tests.csproj index d6aa2f094..f73119522 100644 --- a/tests/Testcontainers.Databases.Tests/Testcontainers.Databases.Tests.csproj +++ b/tests/Testcontainers.Databases.Tests/Testcontainers.Databases.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.DynamoDb.Tests/DynamoDbContainerTest.cs b/tests/Testcontainers.DynamoDb.Tests/DynamoDbContainerTest.cs index dd2440c4a..b348b4229 100644 --- a/tests/Testcontainers.DynamoDb.Tests/DynamoDbContainerTest.cs +++ b/tests/Testcontainers.DynamoDb.Tests/DynamoDbContainerTest.cs @@ -32,7 +32,7 @@ public async Task ListBucketsReturnsHttpStatusCodeOk() // When var tables = await client.ListTablesAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(HttpStatusCode.OK, tables.HttpStatusCode); @@ -68,13 +68,13 @@ public async Task GetItemReturnsPutItem() // When _ = await client.CreateTableAsync(tableRequest) - .ConfigureAwait(false); + .ConfigureAwait(true); _ = await client.PutItemAsync(putItemRequest) - .ConfigureAwait(false); + .ConfigureAwait(true); var itemResponse = await client.GetItemAsync(getItemRequest) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(id, itemResponse.Item.Values.Single().S); diff --git a/tests/Testcontainers.DynamoDb.Tests/Testcontainers.DynamoDb.Tests.csproj b/tests/Testcontainers.DynamoDb.Tests/Testcontainers.DynamoDb.Tests.csproj index c7d5a3494..c414d9ac1 100644 --- a/tests/Testcontainers.DynamoDb.Tests/Testcontainers.DynamoDb.Tests.csproj +++ b/tests/Testcontainers.DynamoDb.Tests/Testcontainers.DynamoDb.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Elasticsearch.Tests/Testcontainers.Elasticsearch.Tests.csproj b/tests/Testcontainers.Elasticsearch.Tests/Testcontainers.Elasticsearch.Tests.csproj index 536bfd491..6e9972b43 100644 --- a/tests/Testcontainers.Elasticsearch.Tests/Testcontainers.Elasticsearch.Tests.csproj +++ b/tests/Testcontainers.Elasticsearch.Tests/Testcontainers.Elasticsearch.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.EventStoreDb.Tests/EventStoreDbContainerTest.cs b/tests/Testcontainers.EventStoreDb.Tests/EventStoreDbContainerTest.cs index 0f714a4ac..c79fc10fd 100644 --- a/tests/Testcontainers.EventStoreDb.Tests/EventStoreDbContainerTest.cs +++ b/tests/Testcontainers.EventStoreDb.Tests/EventStoreDbContainerTest.cs @@ -31,12 +31,12 @@ public async Task ReadStreamReturnsEvent() // When _ = await client.AppendToStreamAsync(streamName, StreamState.NoStream, new[] { eventData }) - .ConfigureAwait(false); + .ConfigureAwait(true); var resolvedEvents = client.ReadStreamAsync(Direction.Forwards, streamName, StreamPosition.Start); var resolvedEvent = await resolvedEvents.FirstAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(eventType, resolvedEvent.Event.EventType); diff --git a/tests/Testcontainers.EventStoreDb.Tests/Testcontainers.EventStoreDb.Tests.csproj b/tests/Testcontainers.EventStoreDb.Tests/Testcontainers.EventStoreDb.Tests.csproj index b4dacd1d0..49e24d971 100644 --- a/tests/Testcontainers.EventStoreDb.Tests/Testcontainers.EventStoreDb.Tests.csproj +++ b/tests/Testcontainers.EventStoreDb.Tests/Testcontainers.EventStoreDb.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.FakeGcsServer.Tests/FakeGcsServerContainerTest.cs b/tests/Testcontainers.FakeGcsServer.Tests/FakeGcsServerContainerTest.cs index 56a5ea787..e3bd3fcbe 100644 --- a/tests/Testcontainers.FakeGcsServer.Tests/FakeGcsServerContainerTest.cs +++ b/tests/Testcontainers.FakeGcsServer.Tests/FakeGcsServerContainerTest.cs @@ -37,16 +37,16 @@ public async Task DownloadObjectReturnsUploadObject() // When var client = await storageClientBuilder.BuildAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); _ = await client.CreateBucketAsync(project, bucket) - .ConfigureAwait(false); + .ConfigureAwait(true); _ = await client.UploadObjectAsync(bucket, fileName, "text/plain", writeStream) - .ConfigureAwait(false); + .ConfigureAwait(true); _ = await client.DownloadObjectAsync(bucket, fileName, readStream) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(helloWorld, Encoding.Default.GetString(readStream.ToArray())); diff --git a/tests/Testcontainers.FakeGcsServer.Tests/Testcontainers.FakeGcsServer.Tests.csproj b/tests/Testcontainers.FakeGcsServer.Tests/Testcontainers.FakeGcsServer.Tests.csproj index 7b5d3b967..c63f8c2fa 100644 --- a/tests/Testcontainers.FakeGcsServer.Tests/Testcontainers.FakeGcsServer.Tests.csproj +++ b/tests/Testcontainers.FakeGcsServer.Tests/Testcontainers.FakeGcsServer.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.FirebirdSql.Tests/FirebirdSqlContainerTest.cs b/tests/Testcontainers.FirebirdSql.Tests/FirebirdSqlContainerTest.cs index 1537a6d8f..e6cf980f9 100644 --- a/tests/Testcontainers.FirebirdSql.Tests/FirebirdSqlContainerTest.cs +++ b/tests/Testcontainers.FirebirdSql.Tests/FirebirdSqlContainerTest.cs @@ -42,7 +42,7 @@ public async Task ExecScriptReturnsSuccessful() // When var execResult = await _firebirdSqlContainer.ExecScriptAsync(scriptContent) - .ConfigureAwait(false); + .ConfigureAwait(true); // When Assert.True(0L.Equals(execResult.ExitCode), execResult.Stderr); diff --git a/tests/Testcontainers.FirebirdSql.Tests/Testcontainers.FirebirdSql.Tests.csproj b/tests/Testcontainers.FirebirdSql.Tests/Testcontainers.FirebirdSql.Tests.csproj index 39556943d..0bf8a4397 100644 --- a/tests/Testcontainers.FirebirdSql.Tests/Testcontainers.FirebirdSql.Tests.csproj +++ b/tests/Testcontainers.FirebirdSql.Tests/Testcontainers.FirebirdSql.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Firestore.Tests/FirestoreContainerTest.cs b/tests/Testcontainers.Firestore.Tests/FirestoreContainerTest.cs index b1090d25e..2cacb3048 100644 --- a/tests/Testcontainers.Firestore.Tests/FirestoreContainerTest.cs +++ b/tests/Testcontainers.Firestore.Tests/FirestoreContainerTest.cs @@ -34,14 +34,14 @@ public async Task GetSnapshotReturnsSetDocument() firestoreDbBuilder.ChannelCredentials = ChannelCredentials.Insecure; var firestoreDb = await firestoreDbBuilder.BuildAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // When _ = await firestoreDb.Collection(collection).Document().SetAsync(documentData) - .ConfigureAwait(false); + .ConfigureAwait(true); var querySnapshot = await firestoreDb.Collection(collection).GetSnapshotAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(documentData, querySnapshot.Documents.Select(document => document.ConvertTo>()).Single()); diff --git a/tests/Testcontainers.Firestore.Tests/Testcontainers.Firestore.Tests.csproj b/tests/Testcontainers.Firestore.Tests/Testcontainers.Firestore.Tests.csproj index b97240efa..e1870e0ff 100644 --- a/tests/Testcontainers.Firestore.Tests/Testcontainers.Firestore.Tests.csproj +++ b/tests/Testcontainers.Firestore.Tests/Testcontainers.Firestore.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.InfluxDb.Tests/InfluxDbContainerTest.cs b/tests/Testcontainers.InfluxDb.Tests/InfluxDbContainerTest.cs index c1dec3d2a..dac4a520e 100644 --- a/tests/Testcontainers.InfluxDb.Tests/InfluxDbContainerTest.cs +++ b/tests/Testcontainers.InfluxDb.Tests/InfluxDbContainerTest.cs @@ -25,7 +25,7 @@ public async Task PingReturnsTrue() // When var result = await client.PingAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.True(result); @@ -56,10 +56,10 @@ public async Task PointQueryReturnsWrittenPoint() // When await writeApi.WritePointAsync(point, InfluxDbBuilder.DefaultBucket, InfluxDbBuilder.DefaultOrganization) - .ConfigureAwait(false); + .ConfigureAwait(true); var fluxTables = await queryApi.QueryAsync(query, InfluxDbBuilder.DefaultOrganization) - .ConfigureAwait(false); + .ConfigureAwait(true); var recordValues = fluxTables.Single().Records.Single().Values; diff --git a/tests/Testcontainers.InfluxDb.Tests/Testcontainers.InfluxDb.Tests.csproj b/tests/Testcontainers.InfluxDb.Tests/Testcontainers.InfluxDb.Tests.csproj index bf3d0d497..1b31020d4 100644 --- a/tests/Testcontainers.InfluxDb.Tests/Testcontainers.InfluxDb.Tests.csproj +++ b/tests/Testcontainers.InfluxDb.Tests/Testcontainers.InfluxDb.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.JanusGraph.Tests/JanusGraphContainerTest.cs b/tests/Testcontainers.JanusGraph.Tests/JanusGraphContainerTest.cs index 0c2273e12..e6b528c0f 100644 --- a/tests/Testcontainers.JanusGraph.Tests/JanusGraphContainerTest.cs +++ b/tests/Testcontainers.JanusGraph.Tests/JanusGraphContainerTest.cs @@ -29,10 +29,10 @@ public async Task InsertedVertexCanBeFound() // When await graphTraversalSource.AddV(label).Promise(traversal => traversal.Iterate()) - .ConfigureAwait(false); + .ConfigureAwait(true); var count = await graphTraversalSource.V().HasLabel(label).Count().Promise(traversal => traversal.Next()) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(1, count); diff --git a/tests/Testcontainers.JanusGraph.Tests/Testcontainers.JanusGraph.Tests.csproj b/tests/Testcontainers.JanusGraph.Tests/Testcontainers.JanusGraph.Tests.csproj index ee3fb0c2a..5938f96ce 100644 --- a/tests/Testcontainers.JanusGraph.Tests/Testcontainers.JanusGraph.Tests.csproj +++ b/tests/Testcontainers.JanusGraph.Tests/Testcontainers.JanusGraph.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.K3s.Tests/K3sContainerTest.cs b/tests/Testcontainers.K3s.Tests/K3sContainerTest.cs index 18954f657..7113b5bc0 100644 --- a/tests/Testcontainers.K3s.Tests/K3sContainerTest.cs +++ b/tests/Testcontainers.K3s.Tests/K3sContainerTest.cs @@ -22,19 +22,19 @@ public async Task CreateNamespaceReturnsHttpStatusCodeCreated() using var kubeconfigStream = new MemoryStream(); var kubeconfig = await _k3sConainter.GetKubeconfigAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); await kubeconfigStream.WriteAsync(Encoding.Default.GetBytes(kubeconfig)) - .ConfigureAwait(false); + .ConfigureAwait(true); var clientConfiguration = await KubernetesClientConfiguration.BuildConfigFromConfigFileAsync(kubeconfigStream) - .ConfigureAwait(false); + .ConfigureAwait(true); using var client = new Kubernetes(clientConfiguration); // When using var response = await client.CoreV1.CreateNamespaceWithHttpMessagesAsync(new V1Namespace(metadata: new V1ObjectMeta(name: Guid.NewGuid().ToString("D")))) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(HttpStatusCode.Created, response.Response.StatusCode); diff --git a/tests/Testcontainers.K3s.Tests/Testcontainers.K3s.Tests.csproj b/tests/Testcontainers.K3s.Tests/Testcontainers.K3s.Tests.csproj index 1fd6f5ace..65c743829 100644 --- a/tests/Testcontainers.K3s.Tests/Testcontainers.K3s.Tests.csproj +++ b/tests/Testcontainers.K3s.Tests/Testcontainers.K3s.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Kafka.Tests/KafkaContainerTest.cs b/tests/Testcontainers.Kafka.Tests/KafkaContainerTest.cs index fe67aa2ea..33220a78c 100644 --- a/tests/Testcontainers.Kafka.Tests/KafkaContainerTest.cs +++ b/tests/Testcontainers.Kafka.Tests/KafkaContainerTest.cs @@ -35,19 +35,14 @@ public async Task ConsumerReturnsProducerMessage() message.Value = Guid.NewGuid().ToString("D"); // When - ConsumeResult result; - - using (var producer = new ProducerBuilder(producerConfig).Build()) - { - _ = await producer.ProduceAsync(topic, message) - .ConfigureAwait(false); - } - - using (var consumer = new ConsumerBuilder(consumerConfig).Build()) - { - consumer.Subscribe(topic); - result = consumer.Consume(TimeSpan.FromSeconds(15)); - } + using var producer = new ProducerBuilder(producerConfig).Build(); + _ = await producer.ProduceAsync(topic, message) + .ConfigureAwait(true); + + using var consumer = new ConsumerBuilder(consumerConfig).Build(); + consumer.Subscribe(topic); + + var result = consumer.Consume(TimeSpan.FromSeconds(15)); // Then Assert.NotNull(result); diff --git a/tests/Testcontainers.Kafka.Tests/Testcontainers.Kafka.Tests.csproj b/tests/Testcontainers.Kafka.Tests/Testcontainers.Kafka.Tests.csproj index fb167de9c..58f3f4534 100644 --- a/tests/Testcontainers.Kafka.Tests/Testcontainers.Kafka.Tests.csproj +++ b/tests/Testcontainers.Kafka.Tests/Testcontainers.Kafka.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Keycloak.Tests/KeycloakContainerTest.cs b/tests/Testcontainers.Keycloak.Tests/KeycloakContainerTest.cs index a194181ed..85f6f69f5 100644 --- a/tests/Testcontainers.Keycloak.Tests/KeycloakContainerTest.cs +++ b/tests/Testcontainers.Keycloak.Tests/KeycloakContainerTest.cs @@ -23,7 +23,7 @@ public async Task GetOpenIdEndpointReturnsHttpStatusCodeOk() // When using var response = await httpClient.GetAsync("/realms/master/.well-known/openid-configuration") - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(HttpStatusCode.OK, response.StatusCode); @@ -37,7 +37,7 @@ public async Task MasterRealmIsEnabled() // When var masterRealm = await keycloakClient.GetRealmAsync("master") - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.True(masterRealm.Enabled); diff --git a/tests/Testcontainers.Keycloak.Tests/Testcontainers.Keycloak.Tests.csproj b/tests/Testcontainers.Keycloak.Tests/Testcontainers.Keycloak.Tests.csproj index e8168eb33..76ba787c5 100644 --- a/tests/Testcontainers.Keycloak.Tests/Testcontainers.Keycloak.Tests.csproj +++ b/tests/Testcontainers.Keycloak.Tests/Testcontainers.Keycloak.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Kusto.Tests/KustoContainerTest.cs b/tests/Testcontainers.Kusto.Tests/KustoContainerTest.cs index 4f80000a2..355ab872c 100644 --- a/tests/Testcontainers.Kusto.Tests/KustoContainerTest.cs +++ b/tests/Testcontainers.Kusto.Tests/KustoContainerTest.cs @@ -23,7 +23,7 @@ public async Task ShowDatabaseReturnsDefaultDbInformation() // When using var dataReader = await client.ExecuteControlCommandAsync("NetDefaultDB", CslCommandGenerator.GenerateDatabaseShowCommand()) - .ConfigureAwait(false); + .ConfigureAwait(true); _ = dataReader.Read(); diff --git a/tests/Testcontainers.Kusto.Tests/Testcontainers.Kusto.Tests.csproj b/tests/Testcontainers.Kusto.Tests/Testcontainers.Kusto.Tests.csproj index 0f97547bf..66f733ba4 100644 --- a/tests/Testcontainers.Kusto.Tests/Testcontainers.Kusto.Tests.csproj +++ b/tests/Testcontainers.Kusto.Tests/Testcontainers.Kusto.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.LocalStack.Tests/LocalStackContainerTest.cs b/tests/Testcontainers.LocalStack.Tests/LocalStackContainerTest.cs index 1a0594a3b..f511600ef 100644 --- a/tests/Testcontainers.LocalStack.Tests/LocalStackContainerTest.cs +++ b/tests/Testcontainers.LocalStack.Tests/LocalStackContainerTest.cs @@ -42,7 +42,7 @@ public async Task CreateLogReturnsHttpStatusCodeOk() // When var logGroupResponse = await client.CreateLogGroupAsync(logGroupRequest) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(HttpStatusCode.OK, logGroupResponse.HttpStatusCode); @@ -79,13 +79,13 @@ public async Task GetItemReturnsPutItem() // When _ = await client.CreateTableAsync(tableRequest) - .ConfigureAwait(false); + .ConfigureAwait(true); _ = await client.PutItemAsync(putItemRequest) - .ConfigureAwait(false); + .ConfigureAwait(true); var itemResponse = await client.GetItemAsync(getItemRequest) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(id, itemResponse.Item.Values.Single().S); @@ -104,7 +104,7 @@ public async Task ListBucketsReturnsHttpStatusCodeOk() // When var buckets = await client.ListBucketsAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(HttpStatusCode.OK, buckets.HttpStatusCode); @@ -123,7 +123,7 @@ public async Task CreateTopicReturnsHttpStatusCodeOk() // When var topicResponse = await client.CreateTopicAsync(Guid.NewGuid().ToString("D")) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(HttpStatusCode.OK, topicResponse.HttpStatusCode); @@ -142,7 +142,7 @@ public async Task CreateQueueReturnsHttpStatusCodeOk() // When var queueResponse = await client.CreateQueueAsync(Guid.NewGuid().ToString("D")) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(HttpStatusCode.OK, queueResponse.HttpStatusCode); diff --git a/tests/Testcontainers.LocalStack.Tests/Testcontainers.LocalStack.Tests.csproj b/tests/Testcontainers.LocalStack.Tests/Testcontainers.LocalStack.Tests.csproj index 84343ee9a..b0725d93c 100644 --- a/tests/Testcontainers.LocalStack.Tests/Testcontainers.LocalStack.Tests.csproj +++ b/tests/Testcontainers.LocalStack.Tests/Testcontainers.LocalStack.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.MariaDb.Tests/MariaDbContainerTest.cs b/tests/Testcontainers.MariaDb.Tests/MariaDbContainerTest.cs index 70c3d478b..3dd575f11 100644 --- a/tests/Testcontainers.MariaDb.Tests/MariaDbContainerTest.cs +++ b/tests/Testcontainers.MariaDb.Tests/MariaDbContainerTest.cs @@ -42,7 +42,7 @@ public async Task ExecScriptReturnsSuccessful() // When var execResult = await _mariaDbContainer.ExecScriptAsync(scriptContent) - .ConfigureAwait(false); + .ConfigureAwait(true); // When Assert.True(0L.Equals(execResult.ExitCode), execResult.Stderr); diff --git a/tests/Testcontainers.MariaDb.Tests/Testcontainers.MariaDb.Tests.csproj b/tests/Testcontainers.MariaDb.Tests/Testcontainers.MariaDb.Tests.csproj index 2b29f52af..9164c8e16 100644 --- a/tests/Testcontainers.MariaDb.Tests/Testcontainers.MariaDb.Tests.csproj +++ b/tests/Testcontainers.MariaDb.Tests/Testcontainers.MariaDb.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Minio.Tests/MinioContainerTest.cs b/tests/Testcontainers.Minio.Tests/MinioContainerTest.cs index 41e1871bb..80eb634ec 100644 --- a/tests/Testcontainers.Minio.Tests/MinioContainerTest.cs +++ b/tests/Testcontainers.Minio.Tests/MinioContainerTest.cs @@ -26,7 +26,7 @@ public async Task ListBucketsReturnsHttpStatusCodeOk() // When var buckets = await client.ListBucketsAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(HttpStatusCode.OK, buckets.HttpStatusCode); @@ -51,13 +51,13 @@ public async Task GetObjectReturnsPutObject() // When _ = await client.PutBucketAsync(objectRequest.BucketName) - .ConfigureAwait(false); + .ConfigureAwait(true); _ = await client.PutObjectAsync(objectRequest) - .ConfigureAwait(false); + .ConfigureAwait(true); var objectResponse = await client.GetObjectAsync(objectRequest.BucketName, objectRequest.Key) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(byte.MaxValue, objectResponse.ContentLength); diff --git a/tests/Testcontainers.Minio.Tests/Testcontainers.Minio.Tests.csproj b/tests/Testcontainers.Minio.Tests/Testcontainers.Minio.Tests.csproj index 37d66d858..b95f5dd10 100644 --- a/tests/Testcontainers.Minio.Tests/Testcontainers.Minio.Tests.csproj +++ b/tests/Testcontainers.Minio.Tests/Testcontainers.Minio.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.MongoDb.Tests/MongoDbContainerTest.cs b/tests/Testcontainers.MongoDb.Tests/MongoDbContainerTest.cs index 38728c372..9c96aae1f 100644 --- a/tests/Testcontainers.MongoDb.Tests/MongoDbContainerTest.cs +++ b/tests/Testcontainers.MongoDb.Tests/MongoDbContainerTest.cs @@ -42,7 +42,7 @@ public async Task ExecScriptReturnsSuccessful() // When var execResult = await _mongoDbContainer.ExecScriptAsync(scriptContent) - .ConfigureAwait(false); + .ConfigureAwait(true); // When Assert.True(0L.Equals(execResult.ExitCode), execResult.Stderr); diff --git a/tests/Testcontainers.MongoDb.Tests/Testcontainers.MongoDb.Tests.csproj b/tests/Testcontainers.MongoDb.Tests/Testcontainers.MongoDb.Tests.csproj index 7f71c4cbb..6ae51b4e5 100644 --- a/tests/Testcontainers.MongoDb.Tests/Testcontainers.MongoDb.Tests.csproj +++ b/tests/Testcontainers.MongoDb.Tests/Testcontainers.MongoDb.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.MsSql.Tests/MsSqlContainerTest.cs b/tests/Testcontainers.MsSql.Tests/MsSqlContainerTest.cs index 723e632d3..19c3c81e4 100644 --- a/tests/Testcontainers.MsSql.Tests/MsSqlContainerTest.cs +++ b/tests/Testcontainers.MsSql.Tests/MsSqlContainerTest.cs @@ -37,7 +37,7 @@ public async Task ExecScriptReturnsSuccessful() // When var execResult = await _msSqlContainer.ExecScriptAsync(scriptContent) - .ConfigureAwait(false); + .ConfigureAwait(true); // When Assert.True(0L.Equals(execResult.ExitCode), execResult.Stderr); diff --git a/tests/Testcontainers.MsSql.Tests/Testcontainers.MsSql.Tests.csproj b/tests/Testcontainers.MsSql.Tests/Testcontainers.MsSql.Tests.csproj index 289e33b54..4f9388f9d 100644 --- a/tests/Testcontainers.MsSql.Tests/Testcontainers.MsSql.Tests.csproj +++ b/tests/Testcontainers.MsSql.Tests/Testcontainers.MsSql.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.MySql.Tests/MySqlContainerTest.cs b/tests/Testcontainers.MySql.Tests/MySqlContainerTest.cs index 0e6655aeb..ea8b958c6 100644 --- a/tests/Testcontainers.MySql.Tests/MySqlContainerTest.cs +++ b/tests/Testcontainers.MySql.Tests/MySqlContainerTest.cs @@ -42,7 +42,7 @@ public async Task ExecScriptReturnsSuccessful() // When var execResult = await _mySqlContainer.ExecScriptAsync(scriptContent) - .ConfigureAwait(false); + .ConfigureAwait(true); // When Assert.True(0L.Equals(execResult.ExitCode), execResult.Stderr); diff --git a/tests/Testcontainers.MySql.Tests/Testcontainers.MySql.Tests.csproj b/tests/Testcontainers.MySql.Tests/Testcontainers.MySql.Tests.csproj index 257cefd33..34483c75b 100644 --- a/tests/Testcontainers.MySql.Tests/Testcontainers.MySql.Tests.csproj +++ b/tests/Testcontainers.MySql.Tests/Testcontainers.MySql.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Nats.Tests/NatsContainerTest.cs b/tests/Testcontainers.Nats.Tests/NatsContainerTest.cs index 0251f6b2a..54ed07645 100644 --- a/tests/Testcontainers.Nats.Tests/NatsContainerTest.cs +++ b/tests/Testcontainers.Nats.Tests/NatsContainerTest.cs @@ -29,10 +29,10 @@ public async Task HealthcheckReturnsHttpStatusCodeOk() // When using var response = await client.GetAsync("/healthz") - .ConfigureAwait(false); + .ConfigureAwait(true); var jsonStatusString = await response.Content.ReadAsStringAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(HttpStatusCode.OK, response.StatusCode); diff --git a/tests/Testcontainers.Nats.Tests/Testcontainers.Nats.Tests.csproj b/tests/Testcontainers.Nats.Tests/Testcontainers.Nats.Tests.csproj index cebf30437..d960eb589 100644 --- a/tests/Testcontainers.Nats.Tests/Testcontainers.Nats.Tests.csproj +++ b/tests/Testcontainers.Nats.Tests/Testcontainers.Nats.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Neo4j.Tests/Testcontainers.Neo4j.Tests.csproj b/tests/Testcontainers.Neo4j.Tests/Testcontainers.Neo4j.Tests.csproj index 161454d60..b3e1d89ce 100644 --- a/tests/Testcontainers.Neo4j.Tests/Testcontainers.Neo4j.Tests.csproj +++ b/tests/Testcontainers.Neo4j.Tests/Testcontainers.Neo4j.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Oracle.Tests/OracleContainerTest.cs b/tests/Testcontainers.Oracle.Tests/OracleContainerTest.cs index c667cb0fa..08e7755f9 100644 --- a/tests/Testcontainers.Oracle.Tests/OracleContainerTest.cs +++ b/tests/Testcontainers.Oracle.Tests/OracleContainerTest.cs @@ -37,7 +37,7 @@ public async Task ExecScriptReturnsSuccessful() // When var execResult = await _oracleContainer.ExecScriptAsync(scriptContent) - .ConfigureAwait(false); + .ConfigureAwait(true); // When Assert.True(0L.Equals(execResult.ExitCode), execResult.Stderr); diff --git a/tests/Testcontainers.Oracle.Tests/Testcontainers.Oracle.Tests.csproj b/tests/Testcontainers.Oracle.Tests/Testcontainers.Oracle.Tests.csproj index 308de093b..03719ae02 100644 --- a/tests/Testcontainers.Oracle.Tests/Testcontainers.Oracle.Tests.csproj +++ b/tests/Testcontainers.Oracle.Tests/Testcontainers.Oracle.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Papercut.Tests/PapercutContainerTest.cs b/tests/Testcontainers.Papercut.Tests/PapercutContainerTest.cs index 6c51f803c..6feba9c73 100644 --- a/tests/Testcontainers.Papercut.Tests/PapercutContainerTest.cs +++ b/tests/Testcontainers.Papercut.Tests/PapercutContainerTest.cs @@ -34,7 +34,7 @@ public async Task ReceivesSentMessage() do { var messagesJson = await httpClient.GetStringAsync("/api/messages") - .ConfigureAwait(false); + .ConfigureAwait(true); var jsonDocument = JsonDocument.Parse(messagesJson); messages = jsonDocument.RootElement.GetProperty("messages").Deserialize(); diff --git a/tests/Testcontainers.Papercut.Tests/Testcontainers.Papercut.Tests.csproj b/tests/Testcontainers.Papercut.Tests/Testcontainers.Papercut.Tests.csproj index 3a73b88c3..0fbb69799 100644 --- a/tests/Testcontainers.Papercut.Tests/Testcontainers.Papercut.Tests.csproj +++ b/tests/Testcontainers.Papercut.Tests/Testcontainers.Papercut.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Platform.Linux.Tests/DependsOnTest.cs b/tests/Testcontainers.Platform.Linux.Tests/DependsOnTest.cs index bb73bb9d8..55a1ab3df 100644 --- a/tests/Testcontainers.Platform.Linux.Tests/DependsOnTest.cs +++ b/tests/Testcontainers.Platform.Linux.Tests/DependsOnTest.cs @@ -56,13 +56,13 @@ public async Task DependsOnCreatesDependentResources() // When var containers = await client.Containers.ListContainersAsync(containersListParameters) - .ConfigureAwait(false); + .ConfigureAwait(true); var networks = await client.Networks.ListNetworksAsync(networksListParameters) - .ConfigureAwait(false); + .ConfigureAwait(true); var volumesListResponse = await client.Volumes.ListAsync(volumesListParameters) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(3, containers.Count); diff --git a/tests/Testcontainers.Platform.Linux.Tests/PortForwardingTest.cs b/tests/Testcontainers.Platform.Linux.Tests/PortForwardingTest.cs index cd9db73e2..b583c5393 100644 --- a/tests/Testcontainers.Platform.Linux.Tests/PortForwardingTest.cs +++ b/tests/Testcontainers.Platform.Linux.Tests/PortForwardingTest.cs @@ -24,10 +24,10 @@ public Task DisposeAsync() public async Task EstablishesHostConnection() { var exitCode = await _container.GetExitCodeAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); var (stdout, _) = await _container.GetLogsAsync(timestampsEnabled: false) - .ConfigureAwait(false); + .ConfigureAwait(true); Assert.Equal(0, exitCode); Assert.Equal(bool.TrueString, stdout); diff --git a/tests/Testcontainers.Platform.Linux.Tests/TarOutputMemoryStreamTest.cs b/tests/Testcontainers.Platform.Linux.Tests/TarOutputMemoryStreamTest.cs index ff5ea321e..d1c986644 100644 --- a/tests/Testcontainers.Platform.Linux.Tests/TarOutputMemoryStreamTest.cs +++ b/tests/Testcontainers.Platform.Linux.Tests/TarOutputMemoryStreamTest.cs @@ -115,23 +115,23 @@ public async Task TestFileExistsInContainer() // When var fileContent = await GetAllBytesAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); await container.CopyAsync(fileContent, targetFilePath2) - .ConfigureAwait(false); + .ConfigureAwait(true); await container.CopyAsync(_testFile.FullName, targetDirectoryPath3) - .ConfigureAwait(false); + .ConfigureAwait(true); await container.CopyAsync(_testFile.Directory.FullName, targetDirectoryPath4) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then var execResults = await Task.WhenAll(targetFilePaths.Select(containerFilePath => container.ExecAsync(new[] { "test", "-f", containerFilePath }))) - .ConfigureAwait(false); + .ConfigureAwait(true); Assert.All(execResults, result => Assert.Equal(0, result.ExitCode)); } diff --git a/tests/Testcontainers.Platform.Linux.Tests/Testcontainers.Platform.Linux.Tests.csproj b/tests/Testcontainers.Platform.Linux.Tests/Testcontainers.Platform.Linux.Tests.csproj index 4ec6e8d34..295327e3e 100644 --- a/tests/Testcontainers.Platform.Linux.Tests/Testcontainers.Platform.Linux.Tests.csproj +++ b/tests/Testcontainers.Platform.Linux.Tests/Testcontainers.Platform.Linux.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Platform.Windows.Tests/Testcontainers.Platform.Windows.Tests.csproj b/tests/Testcontainers.Platform.Windows.Tests/Testcontainers.Platform.Windows.Tests.csproj index 4ec6e8d34..295327e3e 100644 --- a/tests/Testcontainers.Platform.Windows.Tests/Testcontainers.Platform.Windows.Tests.csproj +++ b/tests/Testcontainers.Platform.Windows.Tests/Testcontainers.Platform.Windows.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.PostgreSql.Tests/PostgreSqlContainerTest.cs b/tests/Testcontainers.PostgreSql.Tests/PostgreSqlContainerTest.cs index 10d0c55c0..5433e8c81 100644 --- a/tests/Testcontainers.PostgreSql.Tests/PostgreSqlContainerTest.cs +++ b/tests/Testcontainers.PostgreSql.Tests/PostgreSqlContainerTest.cs @@ -37,7 +37,7 @@ public async Task ExecScriptReturnsSuccessful() // When var execResult = await _postgreSqlContainer.ExecScriptAsync(scriptContent) - .ConfigureAwait(false); + .ConfigureAwait(true); // When Assert.True(0L.Equals(execResult.ExitCode), execResult.Stderr); diff --git a/tests/Testcontainers.PostgreSql.Tests/Testcontainers.PostgreSql.Tests.csproj b/tests/Testcontainers.PostgreSql.Tests/Testcontainers.PostgreSql.Tests.csproj index 565a3e6eb..69a42e5aa 100644 --- a/tests/Testcontainers.PostgreSql.Tests/Testcontainers.PostgreSql.Tests.csproj +++ b/tests/Testcontainers.PostgreSql.Tests/Testcontainers.PostgreSql.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.PubSub.Tests/PubSubContainerTest.cs b/tests/Testcontainers.PubSub.Tests/PubSubContainerTest.cs index 928b5b074..0bbb9bf52 100644 --- a/tests/Testcontainers.PubSub.Tests/PubSubContainerTest.cs +++ b/tests/Testcontainers.PubSub.Tests/PubSubContainerTest.cs @@ -44,25 +44,25 @@ public async Task SubTopicReturnsPubMessage() // When var publisher = await publisherClientBuilder.BuildAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); _ = await publisher.CreateTopicAsync(topicName) - .ConfigureAwait(false); + .ConfigureAwait(true); var subscriber = await subscriberClientBuilder.BuildAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); _ = await subscriber.CreateSubscriptionAsync(subscriptionName, topicName, null, 60) - .ConfigureAwait(false); + .ConfigureAwait(true); _ = await publisher.PublishAsync(topicName, new[] { message }) - .ConfigureAwait(false); + .ConfigureAwait(true); var response = await subscriber.PullAsync(subscriptionName, 1) - .ConfigureAwait(false); + .ConfigureAwait(true); await subscriber.AcknowledgeAsync(subscriptionName, response.ReceivedMessages.Select(receivedMessage => receivedMessage.AckId)) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(helloPubSub, response.ReceivedMessages.Single().Message.Data.ToStringUtf8()); diff --git a/tests/Testcontainers.PubSub.Tests/Testcontainers.PubSub.Tests.csproj b/tests/Testcontainers.PubSub.Tests/Testcontainers.PubSub.Tests.csproj index 5bde7ab26..7c4c04849 100644 --- a/tests/Testcontainers.PubSub.Tests/Testcontainers.PubSub.Tests.csproj +++ b/tests/Testcontainers.PubSub.Tests/Testcontainers.PubSub.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.RabbitMq.Tests/Testcontainers.RabbitMq.Tests.csproj b/tests/Testcontainers.RabbitMq.Tests/Testcontainers.RabbitMq.Tests.csproj index 7a7e423c7..d093c3840 100644 --- a/tests/Testcontainers.RabbitMq.Tests/Testcontainers.RabbitMq.Tests.csproj +++ b/tests/Testcontainers.RabbitMq.Tests/Testcontainers.RabbitMq.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.RavenDb.Tests/Testcontainers.RavenDb.Tests.csproj b/tests/Testcontainers.RavenDb.Tests/Testcontainers.RavenDb.Tests.csproj index 5ba786e26..1cd39f34f 100644 --- a/tests/Testcontainers.RavenDb.Tests/Testcontainers.RavenDb.Tests.csproj +++ b/tests/Testcontainers.RavenDb.Tests/Testcontainers.RavenDb.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Redis.Tests/RedisContainerTest.cs b/tests/Testcontainers.Redis.Tests/RedisContainerTest.cs index 1c82510d5..937dd769d 100644 --- a/tests/Testcontainers.Redis.Tests/RedisContainerTest.cs +++ b/tests/Testcontainers.Redis.Tests/RedisContainerTest.cs @@ -31,7 +31,7 @@ public async Task ExecScriptReturnsSuccessful() // When var execResult = await _redisContainer.ExecScriptAsync(scriptContent) - .ConfigureAwait(false); + .ConfigureAwait(true); // When Assert.True("Hello, scripting!\n".Equals(execResult.Stdout), execResult.Stdout); diff --git a/tests/Testcontainers.Redis.Tests/Testcontainers.Redis.Tests.csproj b/tests/Testcontainers.Redis.Tests/Testcontainers.Redis.Tests.csproj index a146daa70..ef5f4b86b 100644 --- a/tests/Testcontainers.Redis.Tests/Testcontainers.Redis.Tests.csproj +++ b/tests/Testcontainers.Redis.Tests/Testcontainers.Redis.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Redpanda.Tests/RedpandaContainerTest.cs b/tests/Testcontainers.Redpanda.Tests/RedpandaContainerTest.cs index 8438850eb..4df44317b 100644 --- a/tests/Testcontainers.Redpanda.Tests/RedpandaContainerTest.cs +++ b/tests/Testcontainers.Redpanda.Tests/RedpandaContainerTest.cs @@ -35,19 +35,14 @@ public async Task ConsumerReturnsProducerMessage() message.Value = Guid.NewGuid().ToString("D"); // When - ConsumeResult result; - - using (var producer = new ProducerBuilder(producerConfig).Build()) - { - _ = await producer.ProduceAsync(topic, message) - .ConfigureAwait(false); - } - - using (var consumer = new ConsumerBuilder(consumerConfig).Build()) - { - consumer.Subscribe(topic); - result = consumer.Consume(TimeSpan.FromSeconds(15)); - } + using var producer = new ProducerBuilder(producerConfig).Build(); + _ = await producer.ProduceAsync(topic, message) + .ConfigureAwait(true); + + using var consumer = new ConsumerBuilder(consumerConfig).Build(); + consumer.Subscribe(topic); + + var result = consumer.Consume(TimeSpan.FromSeconds(15)); // Then Assert.NotNull(result); diff --git a/tests/Testcontainers.Redpanda.Tests/Testcontainers.Redpanda.Tests.csproj b/tests/Testcontainers.Redpanda.Tests/Testcontainers.Redpanda.Tests.csproj index 1b6a1490a..39d89f31f 100644 --- a/tests/Testcontainers.Redpanda.Tests/Testcontainers.Redpanda.Tests.csproj +++ b/tests/Testcontainers.Redpanda.Tests/Testcontainers.Redpanda.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.ResourceReaper.Tests/DefaultResourceReaperTest.cs b/tests/Testcontainers.ResourceReaper.Tests/DefaultResourceReaperTest.cs index 1a4156122..aaaad3de0 100644 --- a/tests/Testcontainers.ResourceReaper.Tests/DefaultResourceReaperTest.cs +++ b/tests/Testcontainers.ResourceReaper.Tests/DefaultResourceReaperTest.cs @@ -39,10 +39,10 @@ public async Task ContainerCleanUpStartsDefaultResourceReaper(bool resourceReape // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); await container.StopAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(resourceReaperEnabled, DockerCli.ResourceExists(DockerCli.DockerResource.Container, "testcontainers-ryuk-" + ResourceReaper.DefaultSessionId.ToString("D"))); diff --git a/tests/Testcontainers.SqlEdge.Tests/Testcontainers.SqlEdge.Tests.csproj b/tests/Testcontainers.SqlEdge.Tests/Testcontainers.SqlEdge.Tests.csproj index acb2895e1..105d285a1 100644 --- a/tests/Testcontainers.SqlEdge.Tests/Testcontainers.SqlEdge.Tests.csproj +++ b/tests/Testcontainers.SqlEdge.Tests/Testcontainers.SqlEdge.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.Tests/Unit/Configurations/ResourcePropertiesTest.cs b/tests/Testcontainers.Tests/Unit/Configurations/ResourcePropertiesTest.cs index 6b9c3d6b8..aefa927ac 100644 --- a/tests/Testcontainers.Tests/Unit/Configurations/ResourcePropertiesTest.cs +++ b/tests/Testcontainers.Tests/Unit/Configurations/ResourcePropertiesTest.cs @@ -20,28 +20,28 @@ public sealed class ResourcePropertiesTest public async Task QueryNotExistingDockerContainerById() { Assert.False(await Client.Container.ExistsWithIdAsync(ResourceIdOrName) - .ConfigureAwait(false)); + .ConfigureAwait(true)); } [Fact] public async Task QueryNotExistingDockerImageById() { Assert.False(await Client.Image.ExistsWithIdAsync(ResourceIdOrName) - .ConfigureAwait(false)); + .ConfigureAwait(true)); } [Fact] public async Task QueryNotExistingDockerNetworkById() { Assert.False(await Client.Network.ExistsWithIdAsync(ResourceIdOrName) - .ConfigureAwait(false)); + .ConfigureAwait(true)); } [Fact] public async Task QueryNotExistingDockerVolumeById() { Assert.False(await Client.Volume.ExistsWithIdAsync(ResourceIdOrName) - .ConfigureAwait(false)); + .ConfigureAwait(true)); } [Fact] @@ -54,7 +54,7 @@ public async Task QueryContainerInformationOfCreatedContainer() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.NotEmpty(container.Id); @@ -74,7 +74,7 @@ public async Task QueryContainerInformationOfNotCreatedContainer() // When await Task.CompletedTask - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Throws(() => container.Id); @@ -95,7 +95,7 @@ public async Task QueryImageInformationOfNotCreatedImage() // When await Task.CompletedTask - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Throws(() => image.Repository); @@ -113,7 +113,7 @@ public async Task QueryNetworkInformationOfNotCreatedNetwork() // When await Task.CompletedTask - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Throws(() => network.Name); @@ -127,7 +127,7 @@ public async Task QueryVolumeInformationOfNotCreatedVolume() // When await Task.CompletedTask - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Throws(() => volume.Name); diff --git a/tests/Testcontainers.Tests/Unit/Configurations/TestcontainersWaitStrategyTest.cs b/tests/Testcontainers.Tests/Unit/Configurations/TestcontainersWaitStrategyTest.cs index 79af57107..27ba059c6 100644 --- a/tests/Testcontainers.Tests/Unit/Configurations/TestcontainersWaitStrategyTest.cs +++ b/tests/Testcontainers.Tests/Unit/Configurations/TestcontainersWaitStrategyTest.cs @@ -14,7 +14,7 @@ public sealed class Finish : IWaitUntil, IWaitWhile public async Task ImmediatelyUntil() { var exception = await Record.ExceptionAsync(() => WaitStrategy.WaitUntilAsync(() => UntilAsync(null), TimeSpan.FromMilliseconds(25), TimeSpan.FromMilliseconds(100))) - .ConfigureAwait(false); + .ConfigureAwait(true); Assert.Null(exception); } @@ -23,7 +23,7 @@ public async Task ImmediatelyUntil() public async Task ImmediatelyWhile() { var exception = await Record.ExceptionAsync(() => WaitStrategy.WaitWhileAsync(() => WhileAsync(null), TimeSpan.FromMilliseconds(25), TimeSpan.FromMilliseconds(100))) - .ConfigureAwait(false); + .ConfigureAwait(true); Assert.Null(exception); } diff --git a/tests/Testcontainers.Tests/Unit/Configurations/WaitUntilContainerIsHealthyTest.cs b/tests/Testcontainers.Tests/Unit/Configurations/WaitUntilContainerIsHealthyTest.cs index a57213063..856f72b58 100644 --- a/tests/Testcontainers.Tests/Unit/Configurations/WaitUntilContainerIsHealthyTest.cs +++ b/tests/Testcontainers.Tests/Unit/Configurations/WaitUntilContainerIsHealthyTest.cs @@ -28,7 +28,7 @@ public async Task ContainerHealthCheckShouldBeHealthy() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(TestcontainersHealthStatus.Healthy, container.Health); @@ -46,7 +46,7 @@ public async Task ContainerHealthCheckShouldBeUnhealthy() // When _ = await Record.ExceptionAsync(() => container.StartAsync()) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(TestcontainersHealthStatus.Unhealthy, container.Health); diff --git a/tests/Testcontainers.Tests/Unit/Configurations/WaitUntilFileExistsInContainerTest.cs b/tests/Testcontainers.Tests/Unit/Configurations/WaitUntilFileExistsInContainerTest.cs index 007b2ad3e..100f84a94 100644 --- a/tests/Testcontainers.Tests/Unit/Configurations/WaitUntilFileExistsInContainerTest.cs +++ b/tests/Testcontainers.Tests/Unit/Configurations/WaitUntilFileExistsInContainerTest.cs @@ -42,7 +42,7 @@ public void Dispose() public async Task ContainerIsRunning() { var execResult = await _container.ExecAsync(new List { "test", "-f", ContainerFilePath }) - .ConfigureAwait(false); + .ConfigureAwait(true); Assert.Equal(0, execResult.ExitCode); } diff --git a/tests/Testcontainers.Tests/Unit/Configurations/WaitUntilHttpRequestIsSucceededTest.cs b/tests/Testcontainers.Tests/Unit/Configurations/WaitUntilHttpRequestIsSucceededTest.cs index 4581855eb..1f9d4a3b1 100644 --- a/tests/Testcontainers.Tests/Unit/Configurations/WaitUntilHttpRequestIsSucceededTest.cs +++ b/tests/Testcontainers.Tests/Unit/Configurations/WaitUntilHttpRequestIsSucceededTest.cs @@ -48,7 +48,7 @@ public Task DisposeAsync() public async Task HttpWaitStrategyReceivesStatusCode(HttpWaitStrategy httpWaitStrategy) { var succeeded = await httpWaitStrategy.UntilAsync(_container) - .ConfigureAwait(false); + .ConfigureAwait(true); Assert.True(succeeded); } @@ -67,13 +67,13 @@ public async Task HttpWaitStrategySendsHeaders() // When var succeeded = await httpWaitStrategy.UntilAsync(_container) - .ConfigureAwait(false); + .ConfigureAwait(true); await Task.Delay(TimeSpan.FromSeconds(1)) - .ConfigureAwait(false); + .ConfigureAwait(true); var (stdout, _) = await _container.GetLogsAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.True(succeeded); @@ -97,13 +97,13 @@ public async Task HttpWaitStrategyUsesCustomHttpClientHandler() // When var succeeded = await httpWaitStrategy.UntilAsync(_container) - .ConfigureAwait(false); + .ConfigureAwait(true); await Task.Delay(TimeSpan.FromSeconds(1)) - .ConfigureAwait(false); + .ConfigureAwait(true); var (stdout, _) = await _container.GetLogsAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.True(succeeded); @@ -121,10 +121,10 @@ public async Task HttpWaitStrategyReusesCustomHttpClientHandler() // When await httpWaitStrategy.UntilAsync(_container) - .ConfigureAwait(false); + .ConfigureAwait(true); var exceptionOnSubsequentCall = await Record.ExceptionAsync(() => httpWaitStrategy.UntilAsync(_container)) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Null(exceptionOnSubsequentCall); diff --git a/tests/Testcontainers.Tests/Unit/Configurations/WaitUntilOperationIsSucceededTest.cs b/tests/Testcontainers.Tests/Unit/Configurations/WaitUntilOperationIsSucceededTest.cs index 71448d0f3..ae5a2b022 100644 --- a/tests/Testcontainers.Tests/Unit/Configurations/WaitUntilOperationIsSucceededTest.cs +++ b/tests/Testcontainers.Tests/Unit/Configurations/WaitUntilOperationIsSucceededTest.cs @@ -26,7 +26,7 @@ public async Task UntilMaxRepeats(int maxTryCount, int expectedCount) // Then await Assert.ThrowsAsync(() => WaitStrategy.WaitUntilAsync(() => wait.UntilAsync(null), TimeSpan.FromMilliseconds(25), TimeSpan.FromSeconds(5))) - .ConfigureAwait(false); + .ConfigureAwait(true); Assert.Equal(expectedCount, tryCount); } @@ -50,7 +50,7 @@ public async Task UntilSomeRepeats(int maxTryCount, int expectedCount) // Then _ = await Record.ExceptionAsync(() => WaitStrategy.WaitUntilAsync(() => wait.UntilAsync(null), TimeSpan.FromMilliseconds(25), TimeSpan.FromSeconds(5))) - .ConfigureAwait(false); + .ConfigureAwait(true); Assert.Equal(expectedCount, tryCount); } diff --git a/tests/Testcontainers.Tests/Unit/Containers/Unix/GetContainerLogsTest.cs b/tests/Testcontainers.Tests/Unit/Containers/Unix/GetContainerLogsTest.cs index f91d7ddc3..b70b51b8b 100644 --- a/tests/Testcontainers.Tests/Unit/Containers/Unix/GetContainerLogsTest.cs +++ b/tests/Testcontainers.Tests/Unit/Containers/Unix/GetContainerLogsTest.cs @@ -18,7 +18,7 @@ public sealed class GetContainerLogsTest : IAsyncLifetime public async Task GetLogsShouldNotBeEmpty() { var (stdout, _) = await _container.GetLogsAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); Assert.NotEmpty(stdout); } @@ -27,7 +27,7 @@ public async Task GetLogsShouldNotBeEmpty() public async Task GetLogsShouldBeEmptyWhenSinceIsOutOfDateRage() { var (stdout, stderr) = await _container.GetLogsAsync(since: DateTime.Now.AddDays(1)) - .ConfigureAwait(false); + .ConfigureAwait(true); Assert.Empty(stdout); Assert.Empty(stderr); @@ -37,7 +37,7 @@ public async Task GetLogsShouldBeEmptyWhenSinceIsOutOfDateRage() public async Task GetLogsShouldBeEmptyWhenUntilIsOutOfDateRage() { var (stdout, stderr) = await _container.GetLogsAsync(until: DateTime.Now.AddDays(-1)) - .ConfigureAwait(false); + .ConfigureAwait(true); Assert.Empty(stdout); Assert.Empty(stderr); diff --git a/tests/Testcontainers.Tests/Unit/Containers/Unix/ProtectDockerDaemonSocketTest.cs b/tests/Testcontainers.Tests/Unit/Containers/Unix/ProtectDockerDaemonSocketTest.cs index 5a11e2e82..1eb8ef685 100644 --- a/tests/Testcontainers.Tests/Unit/Containers/Unix/ProtectDockerDaemonSocketTest.cs +++ b/tests/Testcontainers.Tests/Unit/Containers/Unix/ProtectDockerDaemonSocketTest.cs @@ -40,7 +40,7 @@ public async Task GetVersionReturnsVersion() // When var version = await client.System.GetVersionAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.StartsWith(version.Version, _fixture.Image.Tag); @@ -68,7 +68,7 @@ public async Task GetVersionReturnsVersion() // When var version = await client.System.GetVersionAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.StartsWith(version.Version, _fixture.Image.Tag); @@ -96,7 +96,7 @@ public async Task GetVersionReturnsVersion() // When var version = await client.System.GetVersionAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.StartsWith(version.Version, _fixture.Image.Tag); diff --git a/tests/Testcontainers.Tests/Unit/Containers/Unix/ReadFileFromContainerTest.cs b/tests/Testcontainers.Tests/Unit/Containers/Unix/ReadFileFromContainerTest.cs index 9bb4b2282..591c3ab9f 100644 --- a/tests/Testcontainers.Tests/Unit/Containers/Unix/ReadFileFromContainerTest.cs +++ b/tests/Testcontainers.Tests/Unit/Containers/Unix/ReadFileFromContainerTest.cs @@ -26,10 +26,10 @@ public async Task ReadExistingFile() // When _ = await _container.ExecAsync(new[] { "/bin/sh", "-c", $"echo {dayOfWeek} > {dayOfWeekFilePath}" }) - .ConfigureAwait(false); + .ConfigureAwait(true); var fileContent = await _container.ReadFileAsync(dayOfWeekFilePath) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(dayOfWeek, Encoding.Default.GetString(fileContent).TrimEnd()); diff --git a/tests/Testcontainers.Tests/Unit/Containers/Unix/TestcontainersContainerCancellationTest.cs b/tests/Testcontainers.Tests/Unit/Containers/Unix/TestcontainersContainerCancellationTest.cs index da1b6f8df..d1a715fbe 100644 --- a/tests/Testcontainers.Tests/Unit/Containers/Unix/TestcontainersContainerCancellationTest.cs +++ b/tests/Testcontainers.Tests/Unit/Containers/Unix/TestcontainersContainerCancellationTest.cs @@ -28,7 +28,7 @@ public async Task Start() // When var exception = await Assert.ThrowsAnyAsync(() => _alpineFixture.Container.StartAsync(cts.Token)) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Contains(exception.GetType(), expectedExceptions); diff --git a/tests/Testcontainers.Tests/Unit/Containers/Unix/TestcontainersContainerTest.cs b/tests/Testcontainers.Tests/Unit/Containers/Unix/TestcontainersContainerTest.cs index 0b51fc4ac..2d8bdd473 100644 --- a/tests/Testcontainers.Tests/Unit/Containers/Unix/TestcontainersContainerTest.cs +++ b/tests/Testcontainers.Tests/Unit/Containers/Unix/TestcontainersContainerTest.cs @@ -35,7 +35,7 @@ public async Task GeneratedContainerName() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.NotEmpty(container.Name); @@ -55,7 +55,7 @@ public async Task SpecifiedContainerName() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.EndsWith(name, container.Name); @@ -75,10 +75,10 @@ public async Task Hostname() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); var exitCode = await container.GetExitCodeAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(0, exitCode); @@ -98,7 +98,7 @@ public async Task MacAddress() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(macAddress, container.MacAddress); @@ -116,10 +116,10 @@ public async Task WorkingDirectory() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); var exitCode = await container.GetExitCodeAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(0, exitCode); @@ -136,10 +136,10 @@ public async Task Entrypoint() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); var exitCode = await container.GetExitCodeAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(255, exitCode); @@ -164,7 +164,7 @@ public async Task StaticPortBinding() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(hostPort, container.GetMappedPublicPort(containerPort)); @@ -185,7 +185,7 @@ public async Task RandomPortBinding() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.NotEqual(containerPort, container.GetMappedPublicPort(containerPort)); @@ -203,7 +203,7 @@ public async Task UnboundPortBindingThrowsException() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Throws(() => container.GetMappedPublicPort(443)); @@ -227,7 +227,7 @@ public async Task BindMountAndCommand() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then var fileInfo = new FileInfo(Path.Combine(TestSession.TempDirectoryPath, file)); @@ -256,7 +256,7 @@ public async Task BindMountAndEnvironment() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then var fileInfo = new FileInfo(Path.Combine(TestSession.TempDirectoryPath, file)); @@ -275,7 +275,7 @@ public async Task DockerEndpoint() // When var exception = await Record.ExceptionAsync(() => container.StartAsync()) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Null(exception); @@ -318,18 +318,18 @@ public async Task OutputConsumer() .Build(); await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); consumer.Stdout.Seek(0, SeekOrigin.Begin); consumer.Stderr.Seek(0, SeekOrigin.Begin); using var stdoutReader = new StreamReader(consumer.Stdout, leaveOpen: true); var stdout = await stdoutReader.ReadToEndAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); using var stderrReader = new StreamReader(consumer.Stderr, leaveOpen: true); var stderr = await stderrReader.ReadToEndAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(unixTimeInMilliseconds, stdout); @@ -348,7 +348,7 @@ public async Task WaitStrategy() // When var exception = await Record.ExceptionAsync(() => container.StartAsync()) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Null(exception); @@ -365,10 +365,10 @@ public async Task ExecCommandInRunningContainer() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); var execResult = await container.ExecAsync(new[] { "/bin/sh", "-c", "exit 255" }) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(255, execResult.ExitCode); @@ -385,10 +385,10 @@ public async Task ExecCommandInRunningContainerWithStdout() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); var execResult = await container.ExecAsync(new[] { "ping", "-c", "1", "google.com" }) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Contains("PING google.com", execResult.Stdout); @@ -405,10 +405,10 @@ public async Task ExecCommandInRunningContainerWithStderr() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); var execResult = await container.ExecAsync(new[] { "ping", "-c", "1", "google.invalid" }) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Contains("ping: bad address 'google.invalid'", execResult.Stderr); @@ -429,13 +429,13 @@ public async Task CopyFileToRunningContainer() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); await container.CopyAsync(Encoding.Default.GetBytes(dayOfWeek), dayOfWeekFilePath) - .ConfigureAwait(false); + .ConfigureAwait(true); var execResult = await container.ExecAsync(new[] { "test", "-f", dayOfWeekFilePath }) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(0, execResult.ExitCode); @@ -454,12 +454,12 @@ public async Task AutoRemoveFalseShouldNotRemoveContainer() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); var id = container.Id; await Task.Delay(TimeSpan.FromSeconds(1)) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.True(DockerCli.ResourceExists(DockerCli.DockerResource.Container, id)); @@ -478,15 +478,15 @@ public async Task AutoRemoveTrueShouldRemoveContainer() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); var id = container.Id; await container.StopAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); await Task.Delay(TimeSpan.FromSeconds(1)) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.False(DockerCli.ResourceExists(DockerCli.DockerResource.Container, id)); @@ -507,7 +507,7 @@ public async Task ParameterModifiers() // When await container.StartAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.EndsWith(name, container.Name); @@ -523,7 +523,7 @@ public async Task PullPolicyNever() .Build(); await Assert.ThrowsAnyAsync(() => container.StartAsync()) - .ConfigureAwait(false); + .ConfigureAwait(true); } } } diff --git a/tests/Testcontainers.Tests/Unit/Images/ImageFromDockerfileTest.cs b/tests/Testcontainers.Tests/Unit/Images/ImageFromDockerfileTest.cs index 815a4b5c5..116b4d323 100644 --- a/tests/Testcontainers.Tests/Unit/Images/ImageFromDockerfileTest.cs +++ b/tests/Testcontainers.Tests/Unit/Images/ImageFromDockerfileTest.cs @@ -47,7 +47,7 @@ public async Task DockerfileArchiveTar() var dockerfileArchive = new DockerfileArchive("Assets/", "Dockerfile", image, NullLogger.Instance); var dockerfileArchiveFilePath = await dockerfileArchive.Tar() - .ConfigureAwait(false); + .ConfigureAwait(true); // When using (var tarOut = new FileStream(dockerfileArchiveFilePath, FileMode.Open, FileAccess.Read)) @@ -76,7 +76,7 @@ public async Task ThrowsDockerfileDoesNotExist() // When var exception = await Assert.ThrowsAsync(() => imageFromDockerfileBuilder.CreateAsync()) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal($"Dockerfile does not exist in '{Path.GetFullPath(dockerfileDirectory)}'.", exception.Message); @@ -94,7 +94,7 @@ public async Task ThrowsDockerfileDirectoryDoesNotExist() // When var exception = await Assert.ThrowsAsync(() => imageFromDockerfileBuilder.CreateAsync()) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal($"Directory '{Path.GetFullPath(dockerfileDirectory)}' does not exist.", exception.Message); @@ -118,10 +118,10 @@ public async Task BuildsDockerImage() // When await imageFromDockerfileBuilder.CreateAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); await imageFromDockerfileBuilder.CreateAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.True(DockerCli.ResourceExists(DockerCli.DockerResource.Image, tag1.FullName)); diff --git a/tests/Testcontainers.Tests/Unit/Networks/TestcontainerNetworkBuilderTest.cs b/tests/Testcontainers.Tests/Unit/Networks/TestcontainerNetworkBuilderTest.cs index 62c5bafc0..9a9fa8e9b 100644 --- a/tests/Testcontainers.Tests/Unit/Networks/TestcontainerNetworkBuilderTest.cs +++ b/tests/Testcontainers.Tests/Unit/Networks/TestcontainerNetworkBuilderTest.cs @@ -53,7 +53,7 @@ public async Task CreateNetworkAssignsOptions() // When var networkResponse = await client.Network.ByIdAsync(_network.Name) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(Option.Value, Assert.Contains(Option.Key, networkResponse.Options)); @@ -67,7 +67,7 @@ public async Task CreateNetworkAssignsLabels() // When var networkResponse = await client.Network.ByIdAsync(_network.Name) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(Label.Value, Assert.Contains(Label.Key, networkResponse.Labels)); diff --git a/tests/Testcontainers.Tests/Unit/Networks/TestcontainersNetworkTest.cs b/tests/Testcontainers.Tests/Unit/Networks/TestcontainersNetworkTest.cs index 9c8483a0e..326e3259d 100644 --- a/tests/Testcontainers.Tests/Unit/Networks/TestcontainersNetworkTest.cs +++ b/tests/Testcontainers.Tests/Unit/Networks/TestcontainersNetworkTest.cs @@ -49,7 +49,7 @@ public async Task PingContainer() // When var execResult = await _container1.ExecAsync(new[] { "ping", "-c", "1", destination }) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(0, execResult.ExitCode); diff --git a/tests/Testcontainers.Tests/Unit/Volumes/TestcontainersVolumeBuilderTest.cs b/tests/Testcontainers.Tests/Unit/Volumes/TestcontainersVolumeBuilderTest.cs index ffccc525f..5cd5747cc 100644 --- a/tests/Testcontainers.Tests/Unit/Volumes/TestcontainersVolumeBuilderTest.cs +++ b/tests/Testcontainers.Tests/Unit/Volumes/TestcontainersVolumeBuilderTest.cs @@ -51,7 +51,7 @@ public async Task CreateVolumeAssignsLabels() // When var volumeResponse = await client.Volume.ByIdAsync(_volume.Name) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.Equal(Label.Value, Assert.Contains(Label.Key, volumeResponse.Labels)); diff --git a/tests/Testcontainers.WebDriver.Tests/Testcontainers.WebDriver.Tests.csproj b/tests/Testcontainers.WebDriver.Tests/Testcontainers.WebDriver.Tests.csproj index af194233e..3a3df7e97 100644 --- a/tests/Testcontainers.WebDriver.Tests/Testcontainers.WebDriver.Tests.csproj +++ b/tests/Testcontainers.WebDriver.Tests/Testcontainers.WebDriver.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tests/Testcontainers.WebDriver.Tests/WebDriverContainerTest.cs b/tests/Testcontainers.WebDriver.Tests/WebDriverContainerTest.cs index 139d25226..fa472ed8e 100644 --- a/tests/Testcontainers.WebDriver.Tests/WebDriverContainerTest.cs +++ b/tests/Testcontainers.WebDriver.Tests/WebDriverContainerTest.cs @@ -70,10 +70,10 @@ public async Task ExportVideoWritesFile() // When await _webDriverContainer.StopAsync() - .ConfigureAwait(false); + .ConfigureAwait(true); await _webDriverContainer.ExportVideoAsync(videoFilePath) - .ConfigureAwait(false); + .ConfigureAwait(true); // Then Assert.True(File.Exists(videoFilePath)); From 0d70ac2f167929b296c25d1c846bb03fc7c54b3a Mon Sep 17 00:00:00 2001 From: Andre Hofmeister <9199345+HofmeisterAn@users.noreply.github.com> Date: Sun, 14 Jan 2024 16:15:18 +0100 Subject: [PATCH 2/2] chore: Simplify HTTP default headers --- .../DockerEndpointAuthenticationConfiguration.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Testcontainers/Configurations/AuthConfigs/DockerEndpointAuthenticationConfiguration.cs b/src/Testcontainers/Configurations/AuthConfigs/DockerEndpointAuthenticationConfiguration.cs index 7ae894ed0..0f8f17991 100644 --- a/src/Testcontainers/Configurations/AuthConfigs/DockerEndpointAuthenticationConfiguration.cs +++ b/src/Testcontainers/Configurations/AuthConfigs/DockerEndpointAuthenticationConfiguration.cs @@ -31,12 +31,9 @@ public DockerEndpointAuthenticationConfiguration(Uri endpoint, Credentials crede /// public DockerClientConfiguration GetDockerClientConfiguration(Guid sessionId = default) { - var defaultHttpRequestHeaders = new ReadOnlyDictionary(new Dictionary - { - { "User-Agent", "tc-dotnet/" + TestcontainersClient.Version }, - { "x-tc-sid", sessionId.ToString("D") }, - }); - + var defaultHttpRequestHeaders = new Dictionary(); + defaultHttpRequestHeaders.Add("User-Agent", "tc-dotnet/" + TestcontainersClient.Version); + defaultHttpRequestHeaders.Add("x-tc-sid", sessionId.ToString("D")); return new DockerClientConfiguration(Endpoint, Credentials, defaultHttpRequestHeaders: defaultHttpRequestHeaders); } }