From: R David Murray <rdmurray@bitdance.com>
Date: Wed, 11 Jun 2014 21:09:43 +0000 (-0400)
Subject: Suppress a couple more DeprecationWarnings in the test suite.
X-Git-Tag: v3.5.0a1~1461
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=130a566a13975d761049ad197fceeff420b6c662;p=thirdparty%2FPython%2Fcpython.git

Suppress a couple more DeprecationWarnings in the test suite.
---

diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
index 4c8ba2d22c3d..42ebb6e60b5e 100644
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -91,7 +91,8 @@ class urlopenNetworkTests(unittest.TestCase):
         # test getcode() with the fancy opener to get 404 error codes
         URL = "http://www.example.com/XXXinvalidXXX"
         with support.transient_internet(URL):
-            open_url = urllib.request.FancyURLopener().open(URL)
+            with self.assertWarns(DeprecationWarning):
+                open_url = urllib.request.FancyURLopener().open(URL)
             try:
                 code = open_url.getcode()
             finally:
diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py
index 7019ee901217..a5499732c22a 100644
--- a/Lib/unittest/test/testmock/testmock.py
+++ b/Lib/unittest/test/testmock/testmock.py
@@ -1211,7 +1211,7 @@ class MockTest(unittest.TestCase):
         m = Mock()
         m.hello(name='hello', daddy='hero')
         text = "call(daddy='hero', name='hello')"
-        self.assertEquals(repr(m.hello.call_args), text)
+        self.assertEqual(repr(m.hello.call_args), text)
 
     def test_mock_add_spec(self):
         class _One(object):