diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-09-29 11:13:27 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-09-29 11:13:27 -0400 |
| commit | f67dd5be98be8295fb480eb9180b730f53b3e95d (patch) | |
| tree | c7f3f55f4a4696479ee8c83aed27247657b63d0e | |
| parent | 6e02dbc3db2e648c23ecbbafc81dff296e8cd262 (diff) | |
| download | python-setuptools-git-f67dd5be98be8295fb480eb9180b730f53b3e95d.tar.gz | |
condense two tests with the same name (closes #19114)
| -rw-r--r-- | tests/test_cmd.py | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/tests/test_cmd.py b/tests/test_cmd.py index 195045cc..cf5197c3 100644 --- a/tests/test_cmd.py +++ b/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__ |
