diff --git a/pandas/tests/indexes/multi/test_constructors.py b/pandas/tests/indexes/multi/test_constructors.py index 7666e9670e6a6..11687b535d2b7 100644 --- a/pandas/tests/indexes/multi/test_constructors.py +++ b/pandas/tests/indexes/multi/test_constructors.py @@ -189,37 +189,24 @@ def test_from_arrays_tuples(idx): tm.assert_index_equal(result, idx) -def test_from_arrays_index_series_datetimetz(): - idx1 = date_range("2015-01-01 10:00", freq="D", periods=3, tz="US/Eastern") - idx2 = date_range("2015-01-01 10:00", freq="H", periods=3, tz="Asia/Tokyo") - result = MultiIndex.from_arrays([idx1, idx2]) - tm.assert_index_equal(result.get_level_values(0), idx1) - tm.assert_index_equal(result.get_level_values(1), idx2) - - result2 = MultiIndex.from_arrays([Series(idx1), Series(idx2)]) - tm.assert_index_equal(result2.get_level_values(0), idx1) - tm.assert_index_equal(result2.get_level_values(1), idx2) - - tm.assert_index_equal(result, result2) - - -def test_from_arrays_index_series_timedelta(): - idx1 = pd.timedelta_range("1 days", freq="D", periods=3) - idx2 = pd.timedelta_range("2 hours", freq="H", periods=3) - result = MultiIndex.from_arrays([idx1, idx2]) - tm.assert_index_equal(result.get_level_values(0), idx1) - tm.assert_index_equal(result.get_level_values(1), idx2) - - result2 = MultiIndex.from_arrays([Series(idx1), Series(idx2)]) - tm.assert_index_equal(result2.get_level_values(0), idx1) - tm.assert_index_equal(result2.get_level_values(1), idx2) - - tm.assert_index_equal(result, result2) - - -def test_from_arrays_index_series_period(): - idx1 = pd.period_range("2011-01-01", freq="D", periods=3) - idx2 = pd.period_range("2015-01-01", freq="H", periods=3) +@pytest.mark.parametrize( + ("idx1", "idx2"), + [ + ( + pd.period_range("2011-01-01", freq="D", periods=3), + pd.period_range("2015-01-01", freq="H", periods=3), + ), + ( + date_range("2015-01-01 10:00", freq="D", periods=3, tz="US/Eastern"), + date_range("2015-01-01 10:00", freq="H", periods=3, tz="Asia/Tokyo"), + ), + ( + pd.timedelta_range("1 days", freq="D", periods=3), + pd.timedelta_range("2 hours", freq="H", periods=3), + ), + ], +) +def test_from_arrays_index_series_period_datetimetz_and_timedelta(idx1, idx2): result = MultiIndex.from_arrays([idx1, idx2]) tm.assert_index_equal(result.get_level_values(0), idx1) tm.assert_index_equal(result.get_level_values(1), idx2) diff --git a/pandas/tests/indexes/multi/test_copy.py b/pandas/tests/indexes/multi/test_copy.py index 8dc8572493444..7ec3df9fee0e5 100644 --- a/pandas/tests/indexes/multi/test_copy.py +++ b/pandas/tests/indexes/multi/test_copy.py @@ -79,10 +79,7 @@ def test_copy_method_kwargs(deep, kwarg, value): names=["first", "second"], ) idx_copy = idx.copy(**{kwarg: value, "deep": deep}) - if kwarg == "names": - assert getattr(idx_copy, kwarg) == value - else: - assert [list(i) for i in getattr(idx_copy, kwarg)] == value + assert getattr(idx_copy, kwarg) == value @pytest.mark.parametrize("deep", [True, False]) diff --git a/pandas/tests/indexes/multi/test_duplicates.py b/pandas/tests/indexes/multi/test_duplicates.py index aa2f37dad152c..26017dd976f73 100644 --- a/pandas/tests/indexes/multi/test_duplicates.py +++ b/pandas/tests/indexes/multi/test_duplicates.py @@ -68,6 +68,7 @@ def test_unique_level(idx, level): mi = MultiIndex.from_arrays([[], []], names=["first", "second"]) result = mi.unique(level=level) expected = mi.get_level_values(level) + tm.assert_index_equal(result, expected) @pytest.mark.parametrize("dropna", [True, False]) diff --git a/pandas/tests/indexes/multi/test_integrity.py b/pandas/tests/indexes/multi/test_integrity.py index f9ab0b3aceec4..2fdf6d1913a0f 100644 --- a/pandas/tests/indexes/multi/test_integrity.py +++ b/pandas/tests/indexes/multi/test_integrity.py @@ -137,7 +137,7 @@ def test_dims(): pass -def take_invalid_kwargs(): +def test_take_invalid_kwargs(): vals = [["A", "B"], [pd.Timestamp("2011-01-01"), pd.Timestamp("2011-01-02")]] idx = MultiIndex.from_product(vals, names=["str", "dt"]) indices = [1, 2]