Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.3 (#19114)

This commit is contained in:
Benjamin Peterson 2013-09-29 11:13:50 -04:00
parent 70157e8f02 56b143d758
commit 5395d211f9
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Lib/distutils/tests/test_cmd.py
View File

@ -34,6 +34,18 @@ class CommandTestCase(unittest.TestCase):
self.assertRaises(DistutilsOptionError, self.assertRaises(DistutilsOptionError,
cmd.ensure_string_list, 'not_string_list2') cmd.ensure_string_list, 'not_string_list2')
cmd.option1 = 'ok,dok'
cmd.ensure_string_list('option1')
self.assertEqual(cmd.option1, ['ok', 'dok'])
cmd.option2 = ['xxx', 'www']
cmd.ensure_string_list('option2')
cmd.option3 = ['ok', 2]
self.assertRaises(DistutilsOptionError, cmd.ensure_string_list,
'option3')
def test_make_file(self): def test_make_file(self):
cmd = self.cmd cmd = self.cmd
@ -77,19 +89,6 @@ class CommandTestCase(unittest.TestCase):
cmd.option3 = 1 cmd.option3 = 1
self.assertRaises(DistutilsOptionError, cmd.ensure_string, 'option3') self.assertRaises(DistutilsOptionError, cmd.ensure_string, 'option3')
def test_ensure_string_list(self):
cmd = self.cmd
cmd.option1 = 'ok,dok'
cmd.ensure_string_list('option1')
self.assertEqual(cmd.option1, ['ok', 'dok'])
cmd.option2 = ['xxx', 'www']
cmd.ensure_string_list('option2')
cmd.option3 = ['ok', 2]
self.assertRaises(DistutilsOptionError, cmd.ensure_string_list,
'option3')
def test_ensure_filename(self): def test_ensure_filename(self):
cmd = self.cmd cmd = self.cmd
cmd.option1 = __file__ cmd.option1 = __file__