[Python-checkins] distutils2: Merge duplicate test_ensure_string_list
tarek.ziade
python-checkins at python.org
Sun Dec 26 14:21:45 CET 2010
tarek.ziade pushed 602495c8fac1 to distutils2:
http://hg.python.org/distutils2/rev/602495c8fac1
changeset: 848:602495c8fac1
user: ?ric Araujo <merwok at netwok.org>
date: Thu Dec 09 21:23:26 2010 +0100
summary:
Merge duplicate test_ensure_string_list
files:
distutils2/tests/test_command_cmd.py
diff --git a/distutils2/tests/test_command_cmd.py b/distutils2/tests/test_command_cmd.py
--- a/distutils2/tests/test_command_cmd.py
+++ b/distutils2/tests/test_command_cmd.py
@@ -17,22 +17,6 @@
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 @@
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
--
Repository URL: http://hg.python.org/distutils2
More information about the Python-checkins
mailing list