[Python-checkins] cpython (3.4): #22315: Use technique outlined in test_file_util

[jason.coombs]

http://hg.python.org/cpython/rev/300cd36eb25c
changeset:   92286:300cd36eb25c
branch:      3.4
user:        Jason R. Coombs <jaraco at jaraco.com>
date:        Sun Aug 31 17:31:32 2014 -0400
summary:
  #22315: Use technique outlined in test_file_util

files:
  Lib/distutils/tests/test_dir_util.py |  27 ++-------------
  1 files changed, 5 insertions(+), 22 deletions(-)


diff --git a/Lib/distutils/tests/test_dir_util.py b/Lib/distutils/tests/test_dir_util.py
--- a/Lib/distutils/tests/test_dir_util.py
+++ b/Lib/distutils/tests/test_dir_util.py
@@ -3,7 +3,7 @@
 import os
 import stat
 import sys
-import contextlib
+from unittest.mock import patch
 
 from distutils import dir_util, errors
 from distutils.dir_util import (mkpath, remove_tree, create_tree, copy_tree,
@@ -14,19 +14,6 @@
 from test.support import run_unittest
 
 
- at contextlib.context_manager
-def patch_obj(obj, attr, replacement):
-    """
-    A poor man's mock.patch.object
-    """
-    orig = getattr(obj, attr)
-    try:
-        setattr(obj, attr, replacement)
-        yield
-    finally:
-        setattr(obj, attr, orig)
-
-
 class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
 
     def _log(self, msg, *args):
@@ -135,17 +122,13 @@
             self.assertEqual(ensure_relative('c:\\home\\foo'), 'c:home\\foo')
             self.assertEqual(ensure_relative('home\\foo'), 'home\\foo')
 
-    def test_copy_tree_exception_in_listdir(self):
+    @patch('os.listdir', side_effect=OSError())
+    def test_copy_tree_exception_in_listdir(self, listdir):
         """
         An exception in listdir should raise a DistutilsFileError
         """
-        def new_listdir(path):
-            raise OSError()
-        # simulate a transient network error or other failure invoking listdir
-        with patch_obj(os, 'listdir', new_listdir):
-            args = 'src', None
-            exc = errors.DistutilsFileError
-            self.assertRaises(exc, dir_util.copy_tree, *args)
+        with self.assertRaises(errors.DistutilsFileError):
+            dir_util.copy_tree('src', None)
 
 
 def test_suite():

-- 
Repository URL: http://hg.python.org/cpython