[Python-checkins] distutils2: Fix a test, uncover a bug, simplify other tests
tarek.ziade
python-checkins at python.org
Sun Dec 26 14:21:45 CET 2010
tarek.ziade pushed 0d5ab4caaab9 to distutils2:
http://hg.python.org/distutils2/rev/0d5ab4caaab9
changeset: 846:0d5ab4caaab9
user: ?ric Araujo <merwok at netwok.org>
date: Thu Dec 09 06:19:46 2010 +0100
summary:
Fix a test, uncover a bug, simplify other tests
files:
distutils2/tests/test_command_register.py
diff --git a/distutils2/tests/test_command_register.py b/distutils2/tests/test_command_register.py
--- a/distutils2/tests/test_command_register.py
+++ b/distutils2/tests/test_command_register.py
@@ -87,6 +87,8 @@
def tearDown(self):
getpass.getpass = self._old_getpass
urllib2.build_opener = self.old_opener
+ if hasattr(register_module, 'raw_input'):
+ del register_module.raw_input
super(RegisterTestCase, self).tearDown()
def _get_cmd(self, metadata=None):
@@ -109,7 +111,6 @@
# patching raw_input and getpass.getpass
# so register gets happy
- #
# Here's what we are faking :
# use your existing login (choice 1.)
# Username : 'tarek'
@@ -117,11 +118,7 @@
# Save your login (y/N)? : 'y'
inputs = RawInputs('1', 'tarek', 'y')
register_module.raw_input = inputs.__call__
- # let's run the command
- try:
- cmd.run()
- finally:
- del register_module.raw_input
+ cmd.run()
# we should have a brand new .pypirc file
self.assertTrue(os.path.exists(self.rc))
@@ -135,8 +132,8 @@
# if we run the command again
def _no_way(prompt=''):
raise AssertionError(prompt)
+
register_module.raw_input = _no_way
-
cmd.show_response = 1
cmd.run()
@@ -165,13 +162,10 @@
cmd = self._get_cmd()
inputs = RawInputs('2', 'tarek', 'tarek at ziade.org')
register_module.raw_input = inputs.__call__
- try:
- # let's run the command
- # FIXME does this send a real request? use a mock server
- # also, silence self.announce (with LoggingCatcher)
- cmd.run()
- finally:
- del register_module.raw_input
+ # let's run the command
+ # FIXME does this send a real request? use a mock server
+ # also, silence self.announce (with LoggingCatcher)
+ cmd.run()
# we should have send a request
self.assertTrue(self.conn.reqs, 1)
@@ -185,11 +179,7 @@
cmd = self._get_cmd()
inputs = RawInputs('3', 'tarek at ziade.org')
register_module.raw_input = inputs.__call__
- try:
- # let's run the command
- cmd.run()
- finally:
- del register_module.raw_input
+ cmd.run()
# we should have send a request
self.assertTrue(self.conn.reqs, 1)
@@ -209,6 +199,8 @@
cmd = self._get_cmd({})
cmd.ensure_finalized()
cmd.strict = 1
+ inputs = RawInputs('1', 'tarek', 'y')
+ register_module.raw_input = inputs.__call__
self.assertRaises(DistutilsSetupError, cmd.run)
# metadata is OK but long_description is broken
@@ -230,22 +222,14 @@
cmd.strict = 1
inputs = RawInputs('1', 'tarek', 'y')
register_module.raw_input = inputs.__call__
- # let's run the command
- try:
- cmd.run()
- finally:
- del register_module.raw_input
+ cmd.run()
# strict is not by default
cmd = self._get_cmd()
cmd.ensure_finalized()
inputs = RawInputs('1', 'tarek', 'y')
register_module.raw_input = inputs.__call__
- # let's run the command
- try:
- cmd.run()
- finally:
- del register_module.raw_input
+ cmd.run()
def test_register_pep345(self):
cmd = self._get_cmd({})
--
Repository URL: http://hg.python.org/distutils2
More information about the Python-checkins
mailing list