Skip to content

Commit 224812b

Browse files
authored
Merge branch 'main' into dependabot/nuget/dotnet-dependencies-041891a2d4
2 parents ef5d443 + 69abb20 commit 224812b

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
4343
- name: Setup .NET (from global.json)
4444
if: steps.csharp_sources.outputs.present == 'true'
45-
uses: actions/setup-dotnet@v4
45+
uses: actions/setup-dotnet@v5
4646
with:
4747
global-json-file: global.json
4848

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
# under TestResults/<guid>/. Non-blocking so a Codecov outage cannot break CI.
9898
- name: Upload coverage to Codecov
9999
# codecov/codecov-action v6.0.1
100-
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
100+
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
101101
with:
102102
fail_ci_if_error: false
103103
flags: unittests

tests/Arcp.IntegrationTests/LeaseExpiryTests.fs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,13 @@ let ``ValidateOpAsync after expires_at raises LEASE_EXPIRED`` () =
5454
"indexer",
5555
fun ctx ->
5656
task {
57-
do! Task.Delay(150)
58-
do! ctx.ValidateOpAsync(Capabilities.FsRead, "/data/file", ctx.CancellationToken)
57+
// Poll until expires_at passes; the first post-expiry
58+
// call raises LEASE_EXPIRED and fails the job. Avoids
59+
// racing a fixed delay against the expiry window.
60+
while true do
61+
do! ctx.ValidateOpAsync(Capabilities.FsRead, "/data/file", ctx.CancellationToken)
62+
do! Task.Delay(25)
63+
5964
return Json.serializeToElement<int> 0
6065
}
6166
))
@@ -67,7 +72,9 @@ let ``ValidateOpAsync after expires_at raises LEASE_EXPIRED`` () =
6772
LeaseConstraints =
6873
Some
6974
{
70-
ExpiresAt = DateTimeOffset.UtcNow.AddMilliseconds(50.0)
75+
// Far enough out that submit-time validation can't see an
76+
// already-expired lease on a slow CI runner.
77+
ExpiresAt = DateTimeOffset.UtcNow.AddSeconds(1.0)
7178
}
7279
}
7380

0 commit comments

Comments
 (0)