Skip to content
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

Skip slow versioning test and update vuln dep #301

Merged
merged 3 commits into from
Jul 10, 2024
+10 −6
Merged

Skip slow versioning test and update vuln dep #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
649886c
Skip slow versioning test
cretz Jul 8, 2024
5b693b5
Merge branch 'main' into slow-versioning-test
cretz Jul 10, 2024
e640e64
Update System.Text.JSON per https://github.com/advisories/GHSA-hh2w-p…
cretz Jul 10, 2024
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
2 changes: 1 addition & 1 deletion src/Temporalio/Temporalio.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<ItemGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
<PackageReference Include="System.Text.Json" Version="6.0.7" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />
</ItemGroup>

<!-- Allow tests to use internals -->
Expand Down
14 changes: 9 additions & 5 deletions tests/Temporalio.Tests/Extensions/Hosting/TemporalWorkerServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ public async Task TemporalWorkerService_ExecuteAsync_MultipleWorkers()
["scoped-other2"] = $"tq: {taskQueue2}, counter: 6",
},
result);
}
}

[Workflow]
public class TickingWorkflow
{
Expand All @@ -221,7 +221,7 @@ public async Task RunAsync()
}
}
}

[Fact]
public async Task TemporalWorkerService_WorkerClientReplacement_UsesNewClient()
{
Expand Down Expand Up @@ -265,7 +265,7 @@ public async Task TemporalWorkerService_WorkerClientReplacement_UsesNewClient()
// Start the host
using var tokenSource = new CancellationTokenSource();
using var host = bld.Build();
var hostTask = Task.Run(() => host.RunAsync(tokenSource.Token));
var hostTask = Task.Run(() => host.RunAsync(tokenSource.Token));

// Confirm the first ticking workflow has completed a task but not the second workflow
await AssertMore.HasEventEventuallyAsync(handle1, e => e.WorkflowTaskCompletedEventAttributes != null);
Expand Down Expand Up @@ -300,9 +300,13 @@ public class WorkflowV2
public async Task<string> RunAsync() => "done-v2";
}

[Fact]
[SkippableFact]
public async Task TemporalWorkerService_ExecuteAsync_MultipleVersionsSameQueue()
{
// This only applies to legacy versioning and therefore is ok to skip (and remove in the
// future)
throw new SkipException("Since 1.24 this test is slow because legacy versioning has a known slowdown");
#pragma warning disable IDE0035, CS0162 // We know the below is now dead code
var taskQueue = $"tq-{Guid.NewGuid()}";
// Build with two workers on same queue but different versions
var bld = Host.CreateApplicationBuilder();
Expand Down