[Python-checkins] r71587 - in python/branches/py3k: Lib/distutils/tests/test_cmd.py
tarek.ziade
python-checkins at python.org
Mon Apr 13 22:07:24 CEST 2009
Author: tarek.ziade
Date: Mon Apr 13 22:07:23 2009
New Revision: 71587
Log:
Merged revisions 71585 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71585 | tarek.ziade | 2009-04-13 22:03:44 +0200 (Mon, 13 Apr 2009) | 1 line
improved test coverage for distutils.cmd
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/distutils/tests/test_cmd.py
Modified: python/branches/py3k/Lib/distutils/tests/test_cmd.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_cmd.py (original)
+++ python/branches/py3k/Lib/distutils/tests/test_cmd.py Mon Apr 13 22:07:23 2009
@@ -1,5 +1,6 @@
"""Tests for distutils.cmd."""
import unittest
+import os
from distutils.cmd import Command
from distutils.dist import Distribution
@@ -62,6 +63,45 @@
' option2 = 1']
self.assertEquals(msgs, wanted)
+ def test_ensure_string(self):
+ cmd = self.cmd
+ cmd.option1 = 'ok'
+ cmd.ensure_string('option1')
+
+ cmd.option2 = None
+ cmd.ensure_string('option2', 'xxx')
+ self.assert_(hasattr(cmd, 'option2'))
+
+ 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.assertEquals(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__
+ cmd.ensure_filename('option1')
+ cmd.option2 = 'xxx'
+ self.assertRaises(DistutilsOptionError, cmd.ensure_filename, 'option2')
+
+ def test_ensure_dirname(self):
+ cmd = self.cmd
+ cmd.option1 = os.path.dirname(__file__)
+ cmd.ensure_dirname('option1')
+ cmd.option2 = 'xxx'
+ self.assertRaises(DistutilsOptionError, cmd.ensure_dirname, 'option2')
+
def test_suite():
return unittest.makeSuite(CommandTestCase)
More information about the Python-checkins
mailing list