From 89dc507eb60193dc32f132cbf17f91e7cd2cd4ff Mon Sep 17 00:00:00 2001 From: ?ric Araujo Date: Thu, 9 Dec 2010 21:23:26 +0100 Subject: Merge duplicate test_ensure_string_list --- distutils2/tests/test_command_cmd.py | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) (limited to 'distutils2/tests/test_command_cmd.py') diff --git a/distutils2/tests/test_command_cmd.py b/distutils2/tests/test_command_cmd.py index 3745291..1a6faf6 100644 --- a/distutils2/tests/test_command_cmd.py +++ b/distutils2/tests/test_command_cmd.py @@ -17,22 +17,6 @@ class CommandTestCase(unittest.TestCase): dist = Distribution() self.cmd = MyCmd(dist) - def test_ensure_string_list(self): - - cmd = self.cmd - cmd.not_string_list = ['one', 2, 'three'] - cmd.yes_string_list = ['one', 'two', 'three'] - cmd.not_string_list2 = object() - cmd.yes_string_list2 = 'ok' - cmd.ensure_string_list('yes_string_list') - cmd.ensure_string_list('yes_string_list2') - - self.assertRaises(DistutilsOptionError, - cmd.ensure_string_list, 'not_string_list') - - self.assertRaises(DistutilsOptionError, - cmd.ensure_string_list, 'not_string_list2') - def test_make_file(self): cmd = self.cmd @@ -82,12 +66,20 @@ class CommandTestCase(unittest.TestCase): cmd.ensure_string_list('option1') self.assertEqual(cmd.option1, ['ok', 'dok']) - cmd.option2 = ['xxx', 'www'] - cmd.ensure_string_list('option2') + cmd.yes_string_list = ['one', 'two', 'three'] + cmd.yes_string_list2 = 'ok' + cmd.ensure_string_list('yes_string_list') + cmd.ensure_string_list('yes_string_list2') + self.assertEqual(cmd.yes_string_list, ['one', 'two', 'three']) + self.assertEqual(cmd.yes_string_list2, ['ok']) - cmd.option3 = ['ok', 2] - self.assertRaises(DistutilsOptionError, cmd.ensure_string_list, - 'option3') + cmd.not_string_list = ['one', 2, 'three'] + cmd.not_string_list2 = object() + self.assertRaises(DistutilsOptionError, + cmd.ensure_string_list, 'not_string_list') + + self.assertRaises(DistutilsOptionError, + cmd.ensure_string_list, 'not_string_list2') def test_ensure_filename(self): cmd = self.cmd -- cgit v1.2.1