Skip to content

Commit

Permalink
Merge pull request #6371 from habitat-sh/shain/timeout_tweaks
Browse files Browse the repository at this point in the history
Tweak windows butterfly test setup
  • Loading branch information
raskchanky authored Apr 8, 2019
2 parents 537b5db + c0fa2d7 commit 6ce6477
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
@@ -302,7 +302,7 @@ steps:
- ./test/run_cargo_test.ps1 butterfly -Features "ignore_inconsistent_tests" -TestOptions "--test-threads=1"
agents:
queue: 'single-use-windows-privileged'
timeout_in_minutes: 25
timeout_in_minutes: 12 # the butterfly tests usually pass in ~10m
retry:
automatic:
limit: 1
@@ -312,7 +312,7 @@ steps:
- ./test/run_cargo_test.ps1 butterfly -TestOptions "--test-threads=1"
agents:
queue: 'single-use-windows-privileged'
timeout_in_minutes: 25
timeout_in_minutes: 12 # the butterfly tests usually pass in ~10m
retry:
automatic:
limit: 10
1 change: 1 addition & 0 deletions components/butterfly/tests/integration.rs
Original file line number Diff line number Diff line change
@@ -55,6 +55,7 @@ fn six_members_meshed_partition_one_node_from_another_node_remains_alive() {
}

#[test]
#[cfg_attr(feature = "ignore_inconsistent_tests", ignore)]
fn six_members_meshed_partition_half_of_nodes_from_each_other_both_sides_confirmed() {
let mut net = btest::SwimNet::new(6);
net.mesh();

0 comments on commit 6ce6477

Please sign in to comment.