diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/string_tests.py | 28 | ||||
| -rw-r--r-- | Lib/test/test_cmd_line.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_cmd_line_script.py | 145 |
3 files changed, 176 insertions, 0 deletions
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py index a789515..116145e 100644 --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -146,6 +146,13 @@ class BaseTest(unittest.TestCase): self.checkequal(3, 'abc', 'find', '', 3) self.checkequal(-1, 'abc', 'find', '', 4) + # to check the ability to pass None as defaults + self.checkequal( 2, 'rrarrrrrrrrra', 'find', 'a') + self.checkequal(12, 'rrarrrrrrrrra', 'find', 'a', 4) + self.checkequal(-1, 'rrarrrrrrrrra', 'find', 'a', 4, 6) + self.checkequal(12, 'rrarrrrrrrrra', 'find', 'a', 4, None) + self.checkequal( 2, 'rrarrrrrrrrra', 'find', 'a', None, 6) + self.checkraises(TypeError, 'hello', 'find') self.checkraises(TypeError, 'hello', 'find', 42) @@ -183,6 +190,13 @@ class BaseTest(unittest.TestCase): self.checkequal(3, 'abc', 'rfind', '', 3) self.checkequal(-1, 'abc', 'rfind', '', 4) + # to check the ability to pass None as defaults + self.checkequal(12, 'rrarrrrrrrrra', 'rfind', 'a') + self.checkequal(12, 'rrarrrrrrrrra', 'rfind', 'a', 4) + self.checkequal(-1, 'rrarrrrrrrrra', 'rfind', 'a', 4, 6) + self.checkequal(12, 'rrarrrrrrrrra', 'rfind', 'a', 4, None) + self.checkequal( 2, 'rrarrrrrrrrra', 'rfind', 'a', None, 6) + self.checkraises(TypeError, 'hello', 'rfind') self.checkraises(TypeError, 'hello', 'rfind', 42) @@ -197,6 +211,13 @@ class BaseTest(unittest.TestCase): self.checkraises(ValueError, 'abcdefghi', 'index', 'ghi', 8) self.checkraises(ValueError, 'abcdefghi', 'index', 'ghi', -1) + # to check the ability to pass None as defaults + self.checkequal( 2, 'rrarrrrrrrrra', 'index', 'a') + self.checkequal(12, 'rrarrrrrrrrra', 'index', 'a', 4) + self.checkraises(ValueError, 'rrarrrrrrrrra', 'index', 'a', 4, 6) + self.checkequal(12, 'rrarrrrrrrrra', 'index', 'a', 4, None) + self.checkequal( 2, 'rrarrrrrrrrra', 'index', 'a', None, 6) + self.checkraises(TypeError, 'hello', 'index') self.checkraises(TypeError, 'hello', 'index', 42) @@ -212,6 +233,13 @@ class BaseTest(unittest.TestCase): self.checkraises(ValueError, 'abcdefghi', 'rindex', 'ghi', 0, 8) self.checkraises(ValueError, 'abcdefghi', 'rindex', 'ghi', 0, -1) + # to check the ability to pass None as defaults + self.checkequal(12, 'rrarrrrrrrrra', 'rindex', 'a') + self.checkequal(12, 'rrarrrrrrrrra', 'rindex', 'a', 4) + self.checkraises(ValueError, 'rrarrrrrrrrra', 'rindex', 'a', 4, 6) + self.checkequal(12, 'rrarrrrrrrrra', 'rindex', 'a', 4, None) + self.checkequal( 2, 'rrarrrrrrrrra', 'rindex', 'a', None, 6) + self.checkraises(TypeError, 'hello', 'rindex') self.checkraises(TypeError, 'hello', 'rindex', 42) diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py index 9204282..db94a40 100644 --- a/Lib/test/test_cmd_line.py +++ b/Lib/test/test_cmd_line.py @@ -1,3 +1,6 @@ +# Tests invocation of the interpreter with various command line arguments +# All tests are executed with environment variables ignored +# See test_cmd_line_script.py for testing of script execution import test.test_support, unittest import sys diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py new file mode 100644 index 0000000..8490540 --- /dev/null +++ b/Lib/test/test_cmd_line_script.py @@ -0,0 +1,145 @@ +# Tests command line execution of scripts +from __future__ import with_statement + +import unittest +import os +import os.path +import sys +import test +import tempfile +import subprocess +import py_compile +import contextlib +import shutil +import zipfile + +verbose = test.test_support.verbose + +# XXX ncoghlan: Should we consider moving these to test_support? +from .test_cmd_line import _spawn_python, _kill_python + +def _run_python(*args): + if __debug__: + p = _spawn_python(*args) + else: + p = _spawn_python('-O', *args) + stdout_data = _kill_python(p) + return p.wait(), stdout_data.decode() + +@contextlib.contextmanager +def temp_dir(): + dirname = tempfile.mkdtemp() + try: + yield dirname + finally: + shutil.rmtree(dirname) + +test_source = ("""\ +# Script may be run with optimisation enabled, so don't rely on assert +# statements being executed +def assertEqual(lhs, rhs): + if lhs != rhs: + raise AssertionError("%r != %r" % (lhs, rhs)) +def assertIdentical(lhs, rhs): + if lhs is not rhs: + raise AssertionError("%r is not %r" % (lhs, rhs)) +# Check basic code execution +result = ['Top level assignment'] +def f(): + result.append('Lower level reference') +f() +assertEqual(result, ['Top level assignment', 'Lower level reference']) +# Check population of magic variables +assertEqual(__name__, '__main__') +print('__file__==%r' % __file__) +# Check the sys module +import sys +assertIdentical(globals(), sys.modules[__name__].__dict__) +print('sys.argv[0]==%r' % sys.argv[0]) +""") + +def _make_test_script(script_dir, script_basename): + script_filename = script_basename+os.path.extsep+"py" + script_name = os.path.join(script_dir, script_filename) + script_file = open(script_name, "w") + script_file.write(test_source) + script_file.close() + return script_name + +def _compile_test_script(script_name): + py_compile.compile(script_name, doraise=True) + if __debug__: + compiled_name = script_name + 'c' + else: + compiled_name = script_name + 'o' + return compiled_name + +def _make_test_zip(zip_dir, zip_basename, script_name): + zip_filename = zip_basename+os.path.extsep+"zip" + zip_name = os.path.join(zip_dir, zip_filename) + zip_file = zipfile.ZipFile(zip_name, 'w') + zip_file.write(script_name, os.path.basename(script_name)) + zip_file.close() + # if verbose: + # zip_file = zipfile.ZipFile(zip_name, 'r') + # print "Contents of %r:" % zip_name + # zip_file.printdir() + # zip_file.close() + return zip_name + +class CmdLineTest(unittest.TestCase): + def _check_script(self, script_name, expected_file, expected_argv0): + exit_code, data = _run_python(script_name) + # if verbose: + # print "Output from test script %r:" % script_name + # print data + self.assertEqual(exit_code, 0, data) + printed_file = '__file__==%r' % expected_file + printed_argv0 = 'sys.argv[0]==%r' % expected_argv0 + self.assert_(printed_file in data, (printed_file, data)) + self.assert_(printed_argv0 in data, (printed_argv0, data)) + + def test_basic_script(self): + with temp_dir() as script_dir: + script_name = _make_test_script(script_dir, "script") + self._check_script(script_name, script_name, script_name) + + def test_script_compiled(self): + with temp_dir() as script_dir: + script_name = _make_test_script(script_dir, "script") + compiled_name = _compile_test_script(script_name) + os.remove(script_name) + self._check_script(compiled_name, compiled_name, compiled_name) + + def test_directory(self): + with temp_dir() as script_dir: + script_name = _make_test_script(script_dir, "__main__") + self._check_script(script_dir, script_name, script_dir) + + def test_directory_compiled(self): + with temp_dir() as script_dir: + script_name = _make_test_script(script_dir, "__main__") + compiled_name = _compile_test_script(script_name) + os.remove(script_name) + self._check_script(script_dir, compiled_name, script_dir) + + def test_zipfile(self): + with temp_dir() as script_dir: + script_name = _make_test_script(script_dir, "__main__") + zip_name = _make_test_zip(script_dir, "test_zip", script_name) + self._check_script(zip_name, None, zip_name) + + def test_zipfile_compiled(self): + with temp_dir() as script_dir: + script_name = _make_test_script(script_dir, "__main__") + compiled_name = _compile_test_script(script_name) + zip_name = _make_test_zip(script_dir, "test_zip", compiled_name) + self._check_script(zip_name, None, zip_name) + + +def test_main(): + test.test_support.run_unittest(CmdLineTest) + test.test_support.reap_children() + +if __name__ == "__main__": + test_main() |