Skip to content

Commit 552266f

Browse files
committed
Attempt to fix MacOS test failures
...or at least produce more useful output if they fail
1 parent d59b229 commit 552266f

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

Lib/test/_test_multiprocessing.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6818,9 +6818,12 @@ def test_std_streams_flushed_after_preload(self):
68186818
print('stderr', file=sys.stderr)''')
68196819

68206820
name = os.path.join(os.path.dirname(__file__), 'mp_preload_flush.py')
6821-
env = {'PYTHONPATH': ":".join(sys.path)}
6821+
env = {'PYTHONPATH': self._temp_dir}
68226822
rc, out, err = test.support.script_helper.assert_python_ok(name, **env)
68236823
self.assertEqual(rc, 0)
6824+
6825+
# We want to see all the output if it isn't as expected
6826+
self.maxDiff = None
68246827
self.assertEqual(out.decode().rstrip(), 'stdout')
68256828
self.assertEqual(err.decode().rstrip(), 'stderr')
68266829

Lib/test/mp_preload_flush.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
import multiprocessing
2+
import sys
3+
24
if __name__ == '__main__':
5+
assert 'a' not in sys.modules
36
multiprocessing.set_forkserver_preload(['a'])
47
for _ in range(2):
58
p = multiprocessing.Process()
69
p.start()
710
p.join()
11+
else:
12+
assert 'a' in sys.modules

0 commit comments

Comments
 (0)