From 2c2bc4fca93989a2c9635b33a1e80bd3af110ff1 Mon Sep 17 00:00:00 2001
From: Romain Dorgueil <romain@dorgueil.net>
Date: Sun, 28 May 2017 23:15:40 +0200
Subject: [PATCH] [qa] fix unclosed files problems in tests.

---
 tests/io/test_csv.py    | 9 ++++++---
 tests/io/test_file.py   | 9 ++++++---
 tests/io/test_json.py   | 6 ++++--
 tests/io/test_pickle.py | 7 ++++---
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/tests/io/test_csv.py b/tests/io/test_csv.py
index bded111..3a6fd37 100644
--- a/tests/io/test_csv.py
+++ b/tests/io/test_csv.py
@@ -19,7 +19,8 @@ def test_write_csv_to_file(tmpdir):
     context.step()
     context.stop()
 
-    assert fs.open(filename).read() == 'foo\nbar\nbaz\n'
+    with fs.open(filename)as fp:
+        assert fp.read() == 'foo\nbar\nbaz\n'
 
     with pytest.raises(AttributeError):
         getattr(context, 'file')
@@ -27,7 +28,8 @@ def test_write_csv_to_file(tmpdir):
 
 def test_read_csv_from_file(tmpdir):
     fs, filename = open_fs(tmpdir), 'input.csv'
-    fs.open(filename, 'w').write('a,b,c\na foo,b foo,c foo\na bar,b bar,c bar')
+    with fs.open(filename, 'w') as fp:
+        fp.write('a,b,c\na foo,b foo,c foo\na bar,b bar,c bar')
 
     reader = CsvReader(path=filename, delimiter=',')
 
@@ -59,7 +61,8 @@ def test_read_csv_from_file(tmpdir):
 
 def test_read_csv_kwargs_output_formater(tmpdir):
     fs, filename = open_fs(tmpdir), 'input.csv'
-    fs.open(filename, 'w').write('a,b,c\na foo,b foo,c foo\na bar,b bar,c bar')
+    with fs.open(filename, 'w') as fp:
+        fp.write('a,b,c\na foo,b foo,c foo\na bar,b bar,c bar')
 
     reader = CsvReader(path=filename, delimiter=',', output_format='kwargs')
 
diff --git a/tests/io/test_file.py b/tests/io/test_file.py
index a6ac8c4..1566b39 100644
--- a/tests/io/test_file.py
+++ b/tests/io/test_file.py
@@ -25,7 +25,8 @@ def test_file_writer_in_context(tmpdir, lines, output):
         context.step()
     context.stop()
 
-    assert fs.open(filename).read() == output
+    with fs.open(filename) as fp:
+        assert fp.read() == output
 
 
 def test_file_writer_out_of_context(tmpdir):
@@ -36,13 +37,15 @@ def test_file_writer_out_of_context(tmpdir):
     with writer.open(fs) as fp:
         fp.write('Yosh!')
 
-    assert fs.open(filename).read() == 'Yosh!'
+    with fs.open(filename) as fp:
+        assert fp.read() == 'Yosh!'
 
 
 def test_file_reader_in_context(tmpdir):
     fs, filename = open_fs(tmpdir), 'input.txt'
 
-    fs.open(filename, 'w').write('Hello\nWorld\n')
+    with fs.open(filename, 'w') as fp:
+        fp.write('Hello\nWorld\n')
 
     reader = FileReader(path=filename)
     context = CapturingNodeExecutionContext(reader, services={'fs': fs})
diff --git a/tests/io/test_json.py b/tests/io/test_json.py
index 442397d..56f679f 100644
--- a/tests/io/test_json.py
+++ b/tests/io/test_json.py
@@ -17,7 +17,8 @@ def test_write_json_to_file(tmpdir):
     context.step()
     context.stop()
 
-    assert fs.open(filename).read() == '[{"foo": "bar"}]'
+    with fs.open(filename) as fp:
+        assert fp.read() == '[{"foo": "bar"}]'
 
     with pytest.raises(AttributeError):
         getattr(context, 'file')
@@ -28,7 +29,8 @@ def test_write_json_to_file(tmpdir):
 
 def test_read_json_from_file(tmpdir):
     fs, filename = open_fs(tmpdir), 'input.json'
-    fs.open(filename, 'w').write('[{"x": "foo"},{"x": "bar"}]')
+    with fs.open(filename, 'w') as fp:
+        fp.write('[{"x": "foo"},{"x": "bar"}]')
     reader = JsonReader(path=filename)
 
     context = CapturingNodeExecutionContext(reader, services={'fs': fs})
diff --git a/tests/io/test_pickle.py b/tests/io/test_pickle.py
index 662fc4a..368e526 100644
--- a/tests/io/test_pickle.py
+++ b/tests/io/test_pickle.py
@@ -20,7 +20,8 @@ def test_write_pickled_dict_to_file(tmpdir):
     context.step()
     context.stop()
 
-    assert pickle.loads(fs.open(filename, 'rb').read()) == {'foo': 'bar'}
+    with fs.open(filename, 'rb') as fp:
+        assert pickle.loads(fp.read()) == {'foo': 'bar'}
 
     with pytest.raises(AttributeError):
         getattr(context, 'file')
@@ -28,8 +29,8 @@ def test_write_pickled_dict_to_file(tmpdir):
 
 def test_read_pickled_list_from_file(tmpdir):
     fs, filename = open_fs(tmpdir), 'input.pkl'
-    fs.open(filename,
-            'wb').write(pickle.dumps([['a', 'b', 'c'], ['a foo', 'b foo', 'c foo'], ['a bar', 'b bar', 'c bar']]))
+    with fs.open(filename, 'wb') as fp:
+        fp.write(pickle.dumps([['a', 'b', 'c'], ['a foo', 'b foo', 'c foo'], ['a bar', 'b bar', 'c bar']]))
 
     reader = PickleReader(path=filename)