8000 [3.7] bpo-34031: fix incorrect usage of self.fail in two tests (GH-8091) by miss-islington · Pull Request #8223 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.7] bpo-34031: fix incorrect usage of self.fail in two tests (GH-8091) #8223

8000
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 10, 2018
Merged

[3.7] bpo-34031: fix incorrect usage of self.fail in two tests (GH-8091) #8223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
bpo-34031: fix incorrect usage of self.fail in two tests (GH-8091) 
Contributed by Bradley Laney.
(cherry picked from commit 6b490b5)

Co-authored-by: Bradley Laney <bradley.laney@gmail.com>
  • Loading branch information
@stoksc @miss-islington
stoksc authored and miss-islington committed Jul 10, 2018
commit ade58738c44b580fd2aee116625668cba198bb59
3 changes: 1 addition & 2 deletions Lib/test/test_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_urllib2_localnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,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()
Expand Down
0