Merge branch 'main' into devs/jd/nofailonupload/I23b18a498f12d64cf221878fb2071c9b713bfbfb

mergify[bot] · web-flow · commit ef0c91e3fe30 · 2025-02-05T16:48:50.000Z
diff --git a/mergify_cli/tests/ci/test_upload.py b/mergify_cli/tests/ci/test_upload.py
@@ -68,8 +68,8 @@ async def test_junit_upload(
             captured.out,
             re.MULTILINE,
         )
-    else:
-        assert "🎉 File(s) uploaded" in captured.out
+
+    assert "🎉 File(s) uploaded" in captured.out
 
 
 @responses.activate(assert_all_requests_are_fired=True)

Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,8 @@ async def test_junit_upload(`
`68`	`68`	`captured.out,`
`69`	`69`	`re.MULTILINE,`
`70`	`70`	`)`
`71`		`- else:`
`72`		`- assert "🎉 File(s) uploaded" in captured.out`
	`71`	`+`
	`72`	`+ assert "🎉 File(s) uploaded" in captured.out`
`73`	`73`
`74`	`74`
`75`	`75`	`@responses.activate(assert_all_requests_are_fired=True)`