[qa] fix unclosed files problems in tests.

This commit is contained in:
Romain Dorgueil
2017-05-28 23:15:40 +02:00
parent 3ca5f962d2
commit 2c2bc4fca9
4 changed files with 20 additions and 11 deletions

View File

@ -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')

View File

@ -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})

View File

@ -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})

View File

@ -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)