bpo-34031: fix incorrect usage of self.fail in two tests (pythonGH-8091)

stoksc · miss-islington · commit 409099680f9a · 2018-07-10T09:49:49.000Z
Contributed by Bradley Laney. (cherry picked from commit 6b490b5) Co-authored-by: Bradley Laney <bradley.laney@gmail.com>
diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
@@ -241,8 +241,7 @@ def testIteration(self):
         # Test for appropriate errors mixing read* and iteration
         for methodname, args in methods:
             f = self.open(TESTFN, 'rb')
-            if next(f) != filler:
-                self.fail, "Broken testfile"
+            self.assertEqual(next(f), filler)
             meth = getattr(f, methodname)
             meth(*args)  # This simply shouldn't fail
             f.close()
diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py
@@ -308,7 +308,7 @@ def test_basic_auth_success(self):
         try:
             self.assertTrue(urllib.request.urlopen(self.server_url))
         except urllib.error.HTTPError:
-            self.fail("Basic auth failed for the url: %s", self.server_url)
+            self.fail("Basic auth failed for the url: %s" % self.server_url)
 
     def test_basic_auth_httperror(self):
         ah = urllib.request.HTTPBasicAuthHandler()
