646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
20 lines
553 B
Diff
20 lines
553 B
Diff
diff --git a/tests/test_merge.py b/tests/test_merge.py
|
|
index 06ee559..9d7b1af 100644
|
|
--- a/tests/test_merge.py
|
|
+++ b/tests/test_merge.py
|
|
@@ -1,3 +1,4 @@
|
|
+import io
|
|
import os
|
|
import sys
|
|
import unittest
|
|
@@ -21,8 +22,7 @@ def file_names_from(file_paths):
|
|
|
|
class TestMerge(unittest.TestCase):
|
|
def setUp(self):
|
|
- if not hasattr(sys.stdout, "getvalue"):
|
|
- self.fail("need to run in buffered mode")
|
|
+ sys.stdout = io.StringIO()
|
|
|
|
def _validate_merged_three(self, merged):
|
|
self.assertEqual(len(merged.cells), 6)
|