From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 21 Jul 2015 19:39:26 +0000 (+0300)
Subject: Issue #24678: Fixed raiseExceptions typo in logging tests.
X-Git-Tag: v3.5.0b4~28^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=750eae1bd4a25dc1d3895b4757d22a6acf262ae9;p=thirdparty%2FPython%2Fcpython.git

Issue #24678: Fixed raiseExceptions typo in logging tests.
Patch by Jacek Kołodziej.
---

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 8770e1b76c59..ddab2e0ecd53 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -41,7 +41,8 @@ import sys
 import tempfile
 from test.script_helper import assert_python_ok
 from test.support import (captured_stdout, run_with_locale, run_unittest,
-                          patch, requires_zlib, TestHandler, Matcher, HOST)
+                          patch, requires_zlib, TestHandler, Matcher, HOST,
+                          swap_attr)
 import textwrap
 import time
 import unittest
@@ -3748,18 +3749,12 @@ class LoggerTest(BaseTest):
                          (exc.__class__, exc, exc.__traceback__))
 
     def test_log_invalid_level_with_raise(self):
-        old_raise = logging.raiseExceptions
-        self.addCleanup(setattr, logging, 'raiseExecptions', old_raise)
-
-        logging.raiseExceptions = True
-        self.assertRaises(TypeError, self.logger.log, '10', 'test message')
+        with swap_attr(logging, 'raiseExceptions', True):
+            self.assertRaises(TypeError, self.logger.log, '10', 'test message')
 
     def test_log_invalid_level_no_raise(self):
-        old_raise = logging.raiseExceptions
-        self.addCleanup(setattr, logging, 'raiseExecptions', old_raise)
-
-        logging.raiseExceptions = False
-        self.logger.log('10', 'test message')  # no exception happens
+        with swap_attr(logging, 'raiseExceptions', False):
+            self.logger.log('10', 'test message')  # no exception happens
 
     def test_find_caller_with_stack_info(self):
         called = []