From d2a179637402cde3c22ab905c6bc5b41012a6a62 Mon Sep 17 00:00:00 2001
From: "Mark A. Grondona" <mark.grondona@gmail.com>
Date: Sat, 4 Jun 2022 08:06:02 -0700
Subject: [PATCH 1/2] mergify: replace strict merge with queue+rebase

Problem: Mergify.io has deprecated the strict merge mode action:

  https://blog.mergify.io/strict-mode-deprecation/

Replace the strict mode configuration with a default queue with a
rebase action which should be equivalent.
---
 .mergify.yml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index a697dab..7b4fca9 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,5 +1,5 @@
-pull_request_rules:
-  - name: rebase and merge when passing all checks
+queue_rules:
+  - name: default
     conditions:
       - base=master
       - status-success="validate commits"
@@ -12,11 +12,22 @@ pull_request_rules:
       - "#approved-reviews-by>0"
       - "#changes-requested-reviews-by=0"
       - -title~=^\[*[Ww][Ii][Pp]
+ 
+pull_request_rules:
+  - name: rebase and merge when passing all checks
+    conditions:
+      - base=master
+      - label="merge-when-passing"
+      - label!="work-in-progress"
+      - "approved-reviews-by=@chaos/chaos-developers"
+      - "#approved-reviews-by>0"
+      - "#changes-requested-reviews-by=0"
+      - -title~=^\[*[Ww][Ii][Pp]
     actions:
-      merge:
+      queue:
+        name: default
         method: merge
-        strict: smart
-        strict_method: rebase
+        update_method: rebase
   - name: remove outdated approved reviews
     conditions:
       - author!=@chaos-developers

From 88b638d54d3a034e231c3039a736aab586421670 Mon Sep 17 00:00:00 2001
From: "Mark A. Grondona" <mark.grondona@gmail.com>
Date: Fri, 10 Jun 2022 07:56:40 -0700
Subject: [PATCH 2/2] t0001-basic.sh: do not fail on stderr in test-lib tests

Problem: The "pretend known breakage" and "fixed known breakage"
tests will fail if the test emits anything on stderr. This might cause
unnecessary test failures if some debug is emitted on pdsh stderr.

Remove the test for empty stderr for these tests.
---
 tests/t0001-basic.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/t0001-basic.sh b/tests/t0001-basic.sh
index ae909c1..01664ca 100755
--- a/tests/t0001-basic.sh
+++ b/tests/t0001-basic.sh
@@ -40,7 +40,6 @@ EOF
 
 chmod +x passing-todo.sh &&
 ./passing-todo.sh >out 2>err &&
-! test -s err &&
 sed -e 's/^> //' >expect <<EOF &&
 > ok 1 - pretend we have fixed a known breakage # TODO known breakage
 > # fixed 1 known breakage(s)
@@ -95,7 +94,6 @@ test_done
 EOF
     chmod +x failing-cleanup.sh &&
     test_must_fail ./failing-cleanup.sh >out 2>err &&
-    ! test -s err &&
     ! test -f \"trash directory.failing-cleanup/clean-after-failure\" &&
 sed -e 's/Z$//' -e 's/^> //' >expect <<\EOF &&
 > not ok - 1 tests clean up even after a failure