From 6f036bb67d5a20c86c29ea5aeace563e3751baab Mon Sep 17 00:00:00 2001
From: Tal Einat <taleinat+github@gmail.com>
Date: Tue, 10 Jul 2018 13:28:09 +0300
Subject: [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)
---
 Lib/test/test_file.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index 57e640d..6bfc4e6 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()
-- 
cgit v0.12