Skip to content

Commit

Permalink
TST: split up test_concat.py pandas-dev#37243
Browse files Browse the repository at this point in the history
 * reverted changes to test_series.py
  • Loading branch information
kamilt5 committed Oct 26, 2020
1 parent ad7a7c6 commit faa0e0b
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions pandas/tests/reshape/concat/test_series.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
import pandas._testing as tm


@pytest.fixture(params=[True, False])
def sort(request):
"""Boolean sort keyword for concat and DataFrame.append."""
return request.param


class TestSeriesConcat:
def test_concat_series(self):

Expand Down Expand Up @@ -46,7 +52,7 @@ def test_concat_empty_and_non_empty_series_regression(self):
result = pd.concat([s1, s2])
tm.assert_series_equal(result, expected)

def test_concat_series_axis1(self, sort=True):
def test_concat_series_axis1(self, sort=sort):
ts = tm.makeTimeSeries()

pieces = [ts[:-2], ts[2:], ts[2:-2]]
Expand Down Expand Up @@ -76,7 +82,6 @@ def test_concat_series_axis1(self, sort=True):
s2 = Series(randn(4), index=["d", "a", "b", "c"], name="B")
result = concat([s, s2], axis=1, sort=sort)
expected = DataFrame({"A": s, "B": s2})

tm.assert_frame_equal(result, expected)

def test_concat_series_axis1_names_applied(self):
Expand Down

0 comments on commit faa0e0b

Please sign in to comment.