Skip to content

Commit

Permalink
TST: placement of network error catching in s3 tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jreback committed Feb 11, 2018
1 parent 324379c commit 36f3a79
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions pandas/tests/io/json/test_pandas.py
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,7 @@ def test_read_inline_jsonl(self):
expected = DataFrame([[1, 2], [1, 2]], columns=['a', 'b'])
assert_frame_equal(result, expected)

@tm.network
def test_read_s3_jsonl(self, s3_resource):
pytest.importorskip('s3fs')
# GH17200
Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/io/parser/test_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ def check_compressed_urls(salaries_table, compression, extension, mode,
tm.assert_frame_equal(url_table, salaries_table)


@tm.network
class TestS3(object):
@tm.network

def test_parse_public_s3_bucket(self):
pytest.importorskip('s3fs')
# more of an integration test due to the not-public contents portion
Expand Down
2 changes: 2 additions & 0 deletions pandas/tests/io/test_parquet.py
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,7 @@ def test_categorical_unsupported(self, pa_lt_070):
df = pd.DataFrame({'a': pd.Categorical(list('abc'))})
self.check_error_on_write(df, pa, NotImplementedError)

@tm.network
def test_s3_roundtrip(self, df_compat, s3_resource, pa):
# GH #19134
check_round_trip(df_compat, pa,
Expand Down Expand Up @@ -498,6 +499,7 @@ def test_filter_row_groups(self, fp):
result = read_parquet(path, fp, filters=[('a', '==', 0)])
assert len(result) == 1

@tm.network
def test_s3_roundtrip(self, df_compat, s3_resource, fp):
# GH #19134
check_round_trip(df_compat, fp,
Expand Down

0 comments on commit 36f3a79

Please sign in to comment.