summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBradley Laney <bradley.laney@gmail.com>2018-07-10 09:46:44 (GMT)
committerTal Einat <taleinat+github@gmail.com>2018-07-10 09:46:44 (GMT)
commit6b490b5db40fc29588e8e6cc23bb89c4fed74ad5 (patch)
tree4062fc0a8295473fe7686dfbb32579546e09725a
parent5ac9e6eee5ed18172d70d28cf438df0be4e3b83d (diff)
downloadcpython-6b490b5db40fc29588e8e6cc23bb89c4fed74ad5.zip
cpython-6b490b5db40fc29588e8e6cc23bb89c4fed74ad5.tar.gz
cpython-6b490b5db40fc29588e8e6cc23bb89c4fed74ad5.tar.bz2
bpo-34031: fix incorrect usage of self.fail in two tests (GH-8091)
Contributed by Bradley Laney.
-rw-r--r--Lib/test/test_file.py3
-rw-r--r--Lib/test/test_urllib2_localnet.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index 9890b8c..f58d1da 100644
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -241,8 +241,7 @@ class OtherFileTests:
# 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
index 52c897a..77dec0c 100644
--- a/Lib/test/test_urllib2_localnet.py
+++ b/Lib/test/test_urllib2_localnet.py
@@ -306,7 +306,7 @@ class BasicAuthTests(unittest.TestCase):
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()