Skip to content

Use TestContainers for Azurite #19162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hishamco wants to merge 2 commits into
base: skrypt/media-azure-gen2
Choose a base branch
from
Open

Use TestContainers for Azurite #19162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
021333c
Use TestContainers for Azurite
hishamco Apr 17, 2026
8dd1b7e
Use virtual for IsHnsEnabled
hishamco Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 0 additions & 90 deletions .github/workflows/integration_tests.yml
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions .github/workflows/main_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,7 @@ jobs:
src/OrchardCore.Mvc.Web/App_Data_Tests/logs
test/OrchardCore.Tests.Functional/traces
retention-days: 3
- name: Integration Tests
Copy link
Copy Markdown
Contributor

@Skrypt Skrypt Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, we should keep the original integration_tests.yml file.

if: matrix.os == 'ubuntu-24.04'
run: |
dotnet test --project ./test/OrchardCore.Tests.Integration/OrchardCore.Tests.Integration.csproj -c Release --no-build
4 changes: 4 additions & 0 deletions .github/workflows/pr_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,7 @@ jobs:
src/OrchardCore.Mvc.Web/App_Data_Tests/logs
test/OrchardCore.Tests.Functional/traces
retention-days: 3
- name: Integration Tests
Copy link
Copy Markdown
Contributor

@Skrypt Skrypt Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above.

if: matrix.os == 'ubuntu-24.04'
run: |
dotnet test --project ./test/OrchardCore.Tests.Integration/OrchardCore.Tests.Integration.csproj -c Release --no-build
4 changes: 4 additions & 0 deletions .github/workflows/preview_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ jobs:
src/OrchardCore.Mvc.Web/App_Data_Tests/logs
test/OrchardCore.Tests.Functional/traces
retention-days: 3
- name: Integration Tests
Copy link
Copy Markdown
Contributor

@Skrypt Skrypt Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

if: matrix.os == 'ubuntu-24.04'
run: |
dotnet test --project ./test/OrchardCore.Tests.Integration/OrchardCore.Tests.Integration.csproj -c Release --no-build
- name: Deploy preview NuGet packages
if: steps.check-publish.outputs.should-publish == 'true'
run: |
Expand Down
3 changes: 2 additions & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
<PackageVersion Include="SixLabors.ImageSharp.Web.Providers.AWS" Version="3.2.0" />
<PackageVersion Include="StackExchange.Redis" Version="2.12.8" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
<PackageVersion Include="Testcontainers.Azurite" Version="4.11.0" />
<PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
<PackageVersion Include="YesSql" Version="5.4.7" />
<PackageVersion Include="YesSql.Abstractions" Version="5.4.7" />
Expand Down Expand Up @@ -111,4 +112,4 @@
<PackageVersion Include="System.IO.Hashing" Version="10.0.5" />
<PackageVersion Include="System.Text.Json" Version="10.0.5" />
</ItemGroup>
</Project>
</Project>
5 changes: 1 addition & 4 deletions test/OrchardCore.Tests.Integration/AzureBlob/BlobFileStoreGen1Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,4 @@ namespace OrchardCore.Tests.Integration.AzureBlob;
/// <summary>
/// Runs all <see cref="BlobFileStoreTestsBase"/> tests with flat-namespace (Gen1) behavior.
/// </summary>
public sealed class BlobFileStoreGen1Tests : BlobFileStoreTestsBase
{
protected override bool IsHnsEnabled => false;
}
public sealed class BlobFileStoreGen1Tests : BlobFileStoreTestsBase;
10 changes: 5 additions & 5 deletions test/OrchardCore.Tests.Integration/AzureBlob/BlobFileStoreGen2Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public sealed class BlobFileStoreGen2Tests : BlobFileStoreTestsBase
{
protected override bool IsHnsEnabled => true;

[AzuriteFact]
[Fact]
Copy link
Copy Markdown
Contributor

@Skrypt Skrypt Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These will all fail because Azurite does not support Gen 2 storage type yet.

public async Task CreateDirectory_Nested_CreatesIntermediateDirectories()
{
await TryCreateDirectoryAsync("a/b/c");
Expand All @@ -21,7 +21,7 @@ public async Task CreateDirectory_Nested_CreatesIntermediateDirectories()
Assert.NotNull(await GetDirectoryInfoAsync("a"));
}

[AzuriteFact]
[Fact]
public async Task GetDirectoryContent_Flat_IncludesGen2Directories()
{
await TryCreateDirectoryAsync("flat-gen2");
Expand All @@ -41,7 +41,7 @@ public async Task GetDirectoryContent_Flat_IncludesGen2Directories()
Assert.Contains(entries, e => !e.IsDirectory && e.Name == "nested.txt");
}

[AzuriteFact]
[Fact]
public async Task MoveFile_IsAtomic()
{
// Gen2 move uses DataLake RenameAsync which is an atomic server-side operation.
Expand All @@ -56,7 +56,7 @@ public async Task MoveFile_IsAtomic()
Assert.Equal("atomic", await ReadFileContentAsync("atomic-dst.txt"));
}

[AzuriteFact]
[Fact]
public async Task GetDirectoryInfo_AfterDeletingDirectory_ReturnsNull()
{
await TryCreateDirectoryAsync("temp-dir");
Expand All @@ -67,7 +67,7 @@ public async Task GetDirectoryInfo_AfterDeletingDirectory_ReturnsNull()
Assert.Null(await GetDirectoryInfoAsync("temp-dir"));
}

[AzuriteFact]
[Fact]
public async Task CreateDirectory_EmptyDirectory_ExistsWithNoContent()
{
await TryCreateDirectoryAsync("empty-gen2-dir");
Expand Down
Loading
Loading