Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/hotshot/0.5.82' into ma/simple-s…
Browse files Browse the repository at this point in the history
…take-table
  • Loading branch information
tbro committed Dec 5, 2024
2 parents e15c2b3 + 74e345e commit 4982a2f
Show file tree
Hide file tree
Showing 66 changed files with 2,278 additions and 1,807 deletions.
11 changes: 10 additions & 1 deletion .config/nextest.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
[profile.default]
slow-timeout = "2m"
# Kill tests after 3 periods of 2m, because they are probably hanging
slow-timeout = { period = "2m", terminate-after = 3 }
default-filter = 'not (test(slow_) | package(tests))'
retries = 2

[[profile.default.overrides]]
# This test is fast if it works (usually about 150ms) but sometimes hangs,
# especially when running concurrently with other tests. Kill it after a while
# and retry up to 10 times.
filter = 'test(test_process_client_handling_stream_subscribe_node_identity)'
slow-timeout = { period = "2s", terminate-after = 1 }
retries = 10

# The restart tests run an entire sequencing network, and so are quite resource intensive.
[[profile.default.overrides]]
filter = 'test(slow_test_restart)'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,13 @@ jobs:
needs: [build-test-bins, build-test-artifacts-postgres]
strategy:
matrix:
version: [02, 03]
version: [02,99]
include:
- version: 02
compose: "-f process-compose.yaml"

- version: 03
compose: "-f process-compose.yaml -f process-compose-mp.yml"
compose: "-f process-compose.yaml -D"
- version: 99
compose: "-f process-compose.yaml -f process-compose-mp.yml -D"
runs-on: ubuntu-latest
steps:
- name: Install Nix
Expand Down
Loading

0 comments on commit 4982a2f

Please sign in to comment.