From: Tal Einat <taleinat+github@gmail.com>
Date: Tue, 10 Jul 2018 10:28:09 +0000 (+0300)
Subject: [2.7] bpo-34031: fix incorrect usage of self.fail in two tests (GH-8091) (#8225)
X-Git-Tag: v2.7.16rc1~206
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f036bb67d5a20c86c29ea5aeace563e3751baab;p=thirdparty%2FPython%2Fcpython.git

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

Actually just one fix on the 2.7 branch.

Contributed by Bradley Laney.

(cherry picked from commit 6b490b5db40fc29588e8e6cc23bb89c4fed74ad5)
---

diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index 57e640d33641..6bfc4e63e7bb 100644
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -247,8 +247,7 @@ class OtherFileTests(unittest.TestCase):
         # 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()