diff --git a/tests/pexpects/bind.py b/tests/pexpects/bind.py index c217d3de4..b86dd016b 100644 --- a/tests/pexpects/bind.py +++ b/tests/pexpects/bind.py @@ -8,7 +8,7 @@ import sys # and fails this a lot. # # Presumably we still have users on macOS that would notice binding errors -if "GITHUB_WORKFLOW" in os.environ and platform.system() == "Darwin": +if "CI" in os.environ and platform.system() == "Darwin": sys.exit(127) sp = SpawnedProc() diff --git a/tests/pexpects/bind_mode_events.py b/tests/pexpects/bind_mode_events.py index 0e74b7162..006d36a7c 100644 --- a/tests/pexpects/bind_mode_events.py +++ b/tests/pexpects/bind_mode_events.py @@ -5,7 +5,6 @@ import sys import signal import platform -# Fails on macOS CI if "CI" in os.environ and platform.system() == "Darwin": sys.exit(127) diff --git a/tests/pexpects/fg.py b/tests/pexpects/fg.py index 17b480e1a..33bea94df 100644 --- a/tests/pexpects/fg.py +++ b/tests/pexpects/fg.py @@ -5,6 +5,9 @@ import subprocess import sys import time +if "CI" in os.environ and platform.system() == "Darwin": + sys.exit(127) + sp = SpawnedProc() send, sendline, sleep, expect_prompt, expect_re, expect_str = ( sp.send, diff --git a/tests/pexpects/signals.py b/tests/pexpects/signals.py index 0b56e4bf8..ef3ea1c69 100644 --- a/tests/pexpects/signals.py +++ b/tests/pexpects/signals.py @@ -18,7 +18,10 @@ import signal import subprocess import sys -if platform.system() == "FreeBSD": # Spurious failure. +if "CI" in os.environ and platform.system() == "Darwin": + sys.exit(127) + +if platform.system() == "FreeBSD": # Spurious failure. TODO Only disable this in CI. sys.exit(127) expect_prompt() diff --git a/tests/pexpects/torn_escapes.py b/tests/pexpects/torn_escapes.py index 4e1feb2b8..6c424b1db 100644 --- a/tests/pexpects/torn_escapes.py +++ b/tests/pexpects/torn_escapes.py @@ -5,6 +5,11 @@ import signal import sys from pexpect_helper import SpawnedProc +if platform.system() == "FreeBSD": # Spurious failure. TODO Only disable this in CI. + sys.exit(127) + +if "CI" in os.environ and platform.system() == "Darwin": + sys.exit(127) sp = SpawnedProc() send, sendline, sleep, expect_prompt, expect_str, expect_re = ( @@ -16,9 +21,6 @@ send, sendline, sleep, expect_prompt, expect_str, expect_re = ( sp.expect_re, ) -if platform.system() == "FreeBSD": # Spurious failure. - sys.exit(127) - # Ensure that signals don't tear escape sequences. See #8628. expect_prompt()