diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-09-29 15:13:50 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-09-29 15:13:50 (GMT) |
| commit | 5395d211f913d88268137f31f09155e9eb996fe8 (patch) | |
| tree | 1a496e6e9588284437f79e96edf49efd38a94205 /Lib/distutils | |
| parent | 70157e8f0276b751a3628ebefb5582c215fd2deb (diff) | |
| parent | 56b143d7580b06a4e6bd4d5e16a5ba1cff45f534 (diff) | |
| download | cpython-5395d211f913d88268137f31f09155e9eb996fe8.zip cpython-5395d211f913d88268137f31f09155e9eb996fe8.tar.gz cpython-5395d211f913d88268137f31f09155e9eb996fe8.tar.bz2 | |
merge 3.3 (#19114)
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/tests/test_cmd.py | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/Lib/distutils/tests/test_cmd.py b/Lib/distutils/tests/test_cmd.py index 195045c..cf5197c 100644 --- a/Lib/distutils/tests/test_cmd.py +++ b/Lib/distutils/tests/test_cmd.py @@ -34,6 +34,18 @@ class CommandTestCase(unittest.TestCase): self.assertRaises(DistutilsOptionError, 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): cmd = self.cmd @@ -77,19 +89,6 @@ class CommandTestCase(unittest.TestCase): cmd.option3 = 1 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): cmd = self.cmd cmd.option1 = __file__ |