Merge remote-tracking branch 'origin/develop' into feature/set-create…

…d-started-stopped-container-timestamp-pass-wait-strategy

.github/workflows/cicd.yml

@@ -78,8 +78,18 @@ jobs:
  - name: Run Tests
  run: dotnet cake --target=Tests --test-filter=${{ startsWith(matrix.os, 'ubuntu') && 'FullyQualifiedName~Testcontainers' || 'DockerPlatform=Windows' }}
 
+ # The Test Reporter GH Action is not yet compatible with the recent
+ # actions/upload-artifact updates: https://github.com/dorny/test-reporter/issues/363.
+ - name: Upload Test And Coverage Results
+ uses: actions/upload-artifact@v3
+ if: true
+ with:
+ name: ${{ matrix.os }}-v3
+ path: test-results
+
  - name: Upload Test And Coverage Results
  uses: actions/upload-artifact@v4
+ if: true
  with:
  name: ${{ matrix.os }}
  path: test-results

.github/workflows/test-report.yml

@@ -0,0 +1,30 @@
+name: Test Report
+
+on:
+ workflow_run:
+ workflows: ['Continuous Integration & Delivery']
+ types:
+ - completed
+
+jobs:
+ report:
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [ ubuntu-22.04, windows-2022 ]
+
+ runs-on: ${{ matrix.os }}
+
+ permissions:
+ actions: read
+ checks: write
+ contents: read
+
+ steps:
+ - name: Publish Test Report
+ uses: dorny/[email protected]
+ with:
+ artifact: ${{ matrix.os }}-v3
+ name: ${{ matrix.os }}
+ path: '*.trx'
+ reporter: dotnet-trx

build.cake

@@ -80,7 +80,6 @@ Task("Tests")
  NoRestore = true,
  NoBuild = true,
  Collectors = new[] { "XPlat Code Coverage;Format=opencover" },
- Loggers = new[] { "trx" },
  Filter = param.TestFilter,
  ResultsDirectory = param.Paths.Directories.TestResultsDirectoryPath,
  ArgumentCustomization = args => args

src/Testcontainers.CosmosDb/CosmosDbBuilder.cs

@@ -45,7 +45,7 @@ protected override CosmosDbBuilder Init()
  return base.Init()
  .WithImage(CosmosDbImage)
  .WithPortBinding(CosmosDbPort, true)
- .WithWaitStrategy(Wait.ForUnixContainer().UntilMessageIsLogged("Started\\r?\\n"));
+ .WithWaitStrategy(Wait.ForUnixContainer().AddCustomWaitStrategy(new WaitUntil()));
  }
 
  /// <inheritdoc />
@@ -65,4 +65,33 @@ protected override CosmosDbBuilder Merge(CosmosDbConfiguration oldValue, CosmosD
  {
  return new CosmosDbBuilder(new CosmosDbConfiguration(oldValue, newValue));
  }
+
+ /// <inheritdoc cref="IWaitUntil" />
+ private sealed class WaitUntil : IWaitUntil
+ {
+ /// <inheritdoc />
+ public async Task<bool> UntilAsync(IContainer container)
+ {
+ // CosmosDB's preconfigured HTTP client will redirect the request to the container.
+ const string requestUri = "https://localhost/_explorer/emulator.pem";
+
+ var httpClient = ((CosmosDbContainer)container).HttpClient;
+
+ try
+ {
+ using var httpResponse = await httpClient.GetAsync(requestUri)
+ .ConfigureAwait(false);
+
+ return httpResponse.IsSuccessStatusCode;
+ }
+ catch (Exception)
+ {
+ return false;
+ }
+ finally
+ {
+ httpClient.Dispose();
+ }
+ }
+ }
 }

tests/Directory.Build.props

@@ -4,4 +4,7 @@
  <PropertyGroup>
  <SignAssembly>false</SignAssembly>
  </PropertyGroup>
+ <PropertyGroup>
+ <VSTestLogger>trx%3BLogFileName=$(MSBuildProjectName).trx</VSTestLogger>
+ </PropertyGroup>
 </Project>