mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix remaining tests and remove an unused import.

Browse source
This commit is contained in:
Berker Peksag 2015-05-06 07:01:52 +03:00
parent c4c59050c8
commit 076dbd0560
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/_test_multiprocessing.py
View file

@ -19,7 +19,7 @@ import logging
import struct import struct
import operator import operator
import test.support import test.support
import test.script_helper import test.support.script_helper
# Skip tests if _multiprocessing wasn't built. # Skip tests if _multiprocessing wasn't built.
@ -3483,11 +3483,11 @@ class TestNoForkBomb(unittest.TestCase):
sm = multiprocessing.get_start_method() sm = multiprocessing.get_start_method()
name = os.path.join(os.path.dirname(__file__), 'mp_fork_bomb.py') name = os.path.join(os.path.dirname(__file__), 'mp_fork_bomb.py')
if sm != 'fork': if sm != 'fork':
rc, out, err = test.script_helper.assert_python_failure(name, sm) rc, out, err = test.support.script_helper.assert_python_failure(name, sm)
self.assertEqual(out, b'') self.assertEqual(out, b'')
self.assertIn(b'RuntimeError', err) self.assertIn(b'RuntimeError', err)
else: else:
rc, out, err = test.script_helper.assert_python_ok(name, sm) rc, out, err = test.support.script_helper.assert_python_ok(name, sm)
self.assertEqual(out.rstrip(), b'123') self.assertEqual(out.rstrip(), b'123')
self.assertEqual(err, b'') self.assertEqual(err, b'')

2
Lib/test/support/script_helper.py
View file

@ -14,7 +14,7 @@ import shutil
import zipfile import zipfile
from importlib.util import source_from_cache from importlib.util import source_from_cache
from test.support import make_legacy_pyc, strip_python_stderr, temp_dir from test.support import make_legacy_pyc, strip_python_stderr
# Cached result of the expensive test performed in the function below. # Cached result of the expensive test performed in the function below.

3
Lib/test/test_compile.py
View file

@ -5,7 +5,8 @@ import sys
import _ast import _ast
import tempfile import tempfile
import types import types
from test import support, script_helper from test import support
from test.support import script_helper
class TestSpecifics(unittest.TestCase): class TestSpecifics(unittest.TestCase):

2
Lib/test/test_tools/test_i18n.py
View file

@ -3,7 +3,7 @@
import os import os
import unittest import unittest
from test.script_helper import assert_python_ok from test.support.script_helper import assert_python_ok
from test.test_tools import toolsdir from test.test_tools import toolsdir
from test.support import temp_cwd from test.support import temp_cwd