mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
Issue #21906: Make Tools/scripts/md5sum.py work in Python 3.
Patch by Zachary Ware.
This commit is contained in:
parent
778015b3bc
commit
7aee3ecd57
3 changed files with 77 additions and 13 deletions
|
@ -16,7 +16,7 @@ import sysconfig
|
|||
import tempfile
|
||||
import textwrap
|
||||
from test import support
|
||||
from test.script_helper import assert_python_ok, temp_dir
|
||||
from test.script_helper import assert_python_ok, assert_python_failure
|
||||
|
||||
if not sysconfig.is_python_build():
|
||||
# XXX some installers do contain the tools, should we detect that
|
||||
|
@ -61,7 +61,7 @@ class PindentTests(unittest.TestCase):
|
|||
|
||||
def test_selftest(self):
|
||||
self.maxDiff = None
|
||||
with temp_dir() as directory:
|
||||
with support.temp_dir() as directory:
|
||||
data_path = os.path.join(directory, '_test.py')
|
||||
with open(self.script) as f:
|
||||
closed = f.read()
|
||||
|
@ -367,7 +367,7 @@ class TestSundryScripts(unittest.TestCase):
|
|||
# added for a script it should be added to the whitelist below.
|
||||
|
||||
# scripts that have independent tests.
|
||||
whitelist = ['reindent.py', 'pdeps.py', 'gprof2html']
|
||||
whitelist = ['reindent.py', 'pdeps.py', 'gprof2html', 'md5sum.py']
|
||||
# scripts that can't be imported without running
|
||||
blacklist = ['make_ctype.py']
|
||||
# scripts that use windows-only modules
|
||||
|
@ -450,16 +450,74 @@ class Gprof2htmlTests(unittest.TestCase):
|
|||
self.assertTrue(wmock.open.called)
|
||||
|
||||
|
||||
class MD5SumTests(unittest.TestCase):
|
||||
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
cls.script = os.path.join(scriptsdir, 'md5sum.py')
|
||||
os.mkdir(support.TESTFN)
|
||||
cls.fodder = os.path.join(support.TESTFN, 'md5sum.fodder')
|
||||
with open(cls.fodder, 'wb') as f:
|
||||
f.write(b'md5sum\r\ntest file\r\n')
|
||||
cls.fodder_md5 = b'd38dae2eb1ab346a292ef6850f9e1a0d'
|
||||
cls.fodder_textmode_md5 = b'a8b07894e2ca3f2a4c3094065fa6e0a5'
|
||||
|
||||
@classmethod
|
||||
def tearDownClass(cls):
|
||||
support.rmtree(support.TESTFN)
|
||||
|
||||
def test_noargs(self):
|
||||
rc, out, err = assert_python_ok(self.script)
|
||||
self.assertEqual(rc, 0)
|
||||
self.assertTrue(
|
||||
out.startswith(b'd41d8cd98f00b204e9800998ecf8427e <stdin>'))
|
||||
self.assertFalse(err)
|
||||
|
||||
def test_checksum_fodder(self):
|
||||
rc, out, err = assert_python_ok(self.script, self.fodder)
|
||||
self.assertEqual(rc, 0)
|
||||
self.assertTrue(out.startswith(self.fodder_md5))
|
||||
for part in self.fodder.split(os.path.sep):
|
||||
self.assertIn(part.encode(), out)
|
||||
self.assertFalse(err)
|
||||
|
||||
def test_dash_l(self):
|
||||
rc, out, err = assert_python_ok(self.script, '-l', self.fodder)
|
||||
self.assertEqual(rc, 0)
|
||||
self.assertIn(self.fodder_md5, out)
|
||||
parts = self.fodder.split(os.path.sep)
|
||||
self.assertIn(parts[-1].encode(), out)
|
||||
self.assertNotIn(parts[-2].encode(), out)
|
||||
|
||||
def test_dash_t(self):
|
||||
rc, out, err = assert_python_ok(self.script, '-t', self.fodder)
|
||||
self.assertEqual(rc, 0)
|
||||
self.assertTrue(out.startswith(self.fodder_textmode_md5))
|
||||
self.assertNotIn(self.fodder_md5, out)
|
||||
|
||||
def test_dash_s(self):
|
||||
rc, out, err = assert_python_ok(self.script, '-s', '512', self.fodder)
|
||||
self.assertEqual(rc, 0)
|
||||
self.assertIn(self.fodder_md5, out)
|
||||
|
||||
def test_multiple_files(self):
|
||||
rc, out, err = assert_python_ok(self.script, self.fodder, self.fodder)
|
||||
self.assertEqual(rc, 0)
|
||||
lines = out.splitlines()
|
||||
self.assertEqual(len(lines), 2)
|
||||
self.assertEqual(*lines)
|
||||
|
||||
def test_usage(self):
|
||||
rc, out, err = assert_python_failure(self.script, '-h')
|
||||
self.assertEqual(rc, 2)
|
||||
self.assertEqual(out, b'')
|
||||
self.assertGreater(err, b'')
|
||||
|
||||
|
||||
# Run the tests in Tools/parser/test_unparse.py
|
||||
with support.DirsOnSysPath(os.path.join(basepath, 'parser')):
|
||||
from test_unparse import UnparseTestCase
|
||||
from test_unparse import DirectoryTestCase
|
||||
|
||||
|
||||
def test_main():
|
||||
support.run_unittest(*[obj for obj in globals().values()
|
||||
if isinstance(obj, type)])
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue