with open(), remove test_array from TSAN tests

Author: tom-pytel

Lib/test/libregrtest/tsan.py

@@ -2,7 +2,6 @@
 # chosen because they use threads and run in a reasonable amount of time.
 
 TSAN_TESTS = [
-    'test_array',
     'test_asyncio',
     'test_capi',
     'test_code',

Lib/test/test_array.py

@@ -475,22 +475,18 @@ def test_tofromfile(self):
         self.assertRaises(TypeError, a.tofile)
         with os_helper.temp_dir() as temp_dir:
             temp_path = os.path.join(temp_dir, os_helper.TESTFN)
-            f = open(temp_path, 'wb')
             try:
-                a.tofile(f)
-                f.close()
+                with open(temp_path, 'wb') as f:
+                    a.tofile(f)
                 b = array.array(self.typecode)
-                f = open(temp_path, 'rb')
-                self.assertRaises(TypeError, b.fromfile)
-                b.fromfile(f, len(self.example))
-                self.assertEqual(b, array.array(self.typecode, self.example))
-                self.assertNotEqual(a, b)
-                self.assertRaises(EOFError, b.fromfile, f, len(self.example)+1)
-                self.assertEqual(a, b)
-                f.close()
+                with open(temp_path, 'rb') as f:
+                    self.assertRaises(TypeError, b.fromfile)
+                    b.fromfile(f, len(self.example))
+                    self.assertEqual(b, array.array(self.typecode, self.example))
+                    self.assertNotEqual(a, b)
+                    self.assertRaises(EOFError, b.fromfile, f, len(self.example)+1)
+                    self.assertEqual(a, b)
             finally:
-                if not f.closed:
-                    f.close()
                 os_helper.unlink(temp_path)
 
     def test_fromfile_ioerror(self):
@@ -499,32 +495,27 @@ def test_fromfile_ioerror(self):
         a = array.array(self.typecode)
         with os_helper.temp_dir() as temp_dir:
             temp_path = os.path.join(temp_dir, os_helper.TESTFN)
-            f = open(temp_path, 'wb')
             try:
-                self.assertRaises(OSError, a.fromfile, f, len(self.example))
+                with open(temp_path, 'wb') as f:
+                    self.assertRaises(OSError, a.fromfile, f, len(self.example))
             finally:
-                f.close()
                 os_helper.unlink(temp_path)
 
     def test_filewrite(self):
         a = array.array(self.typecode, 2*self.example)
         with os_helper.temp_dir() as temp_dir:
             temp_path = os.path.join(temp_dir, os_helper.TESTFN)
-            f = open(temp_path, 'wb')
             try:
-                f.write(a)
-                f.close()
+                with open(temp_path, 'wb') as f:
+                    f.write(a)
                 b = array.array(self.typecode)
-                f = open(temp_path, 'rb')
-                b.fromfile(f, len(self.example))
-                self.assertEqual(b, array.array(self.typecode, self.example))
-                self.assertNotEqual(a, b)
-                b.fromfile(f, len(self.example))
-                self.assertEqual(a, b)
-                f.close()
+                with open(temp_path, 'rb') as f:
+                    b.fromfile(f, len(self.example))
+                    self.assertEqual(b, array.array(self.typecode, self.example))
+                    self.assertNotEqual(a, b)
+                    b.fromfile(f, len(self.example))
+                    self.assertEqual(a, b)
             finally:
-                if not f.closed:
-                    f.close()
                 os_helper.unlink(temp_path)
 
     def test_tofromlist(self):