Tweak windows butterfly test setup

Signed-off-by: Scott Hain <[email protected]>
habitat-sh · Apr 3, 2019 · c0fa2d7 · c0fa2d7
1 parent 03beff7
commit c0fa2d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
@@ -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

diff --git a/components/butterfly/tests/integration.rs b/components/butterfly/tests/integration.rs
@@ -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();