Skip to content

Commit dd3c4cc

Browse files
author
Ben Kandel
committed
comments
1 parent 5cd8392 commit dd3c4cc

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

pandas/tests/frame/test_combine_concat.py

+9-8
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@
1212
from pandas import DataFrame, Index, Series, Timestamp
1313
from pandas.compat import lrange
1414

15-
from pandas.core.base import FrozenList
16-
1715
from pandas.tests.frame.common import TestData
1816

1917
import pandas.util.testing as tm
2018
from pandas.util.testing import (assertRaisesRegexp,
21-
assert_equal,
2219
assert_frame_equal,
2320
assert_series_equal)
2421

@@ -329,14 +326,18 @@ def test_join_multiindex_leftright(self):
329326

330327
def test_concat_named_keys(self):
331328
# GH 14252
332-
df = DataFrame({'foo': [1, 2, 3, 4],
333-
'bar': [0.1, 0.2, 0.3, 0.4]})
329+
df = pd.DataFrame({'foo': [1, 2], 'bar': [0.1, 0.2]})
330+
df_concatted = pd.DataFrame(
331+
{'foo': [1, 2, 1, 2], 'bar': [0.1, 0.2, 0.1, 0.2]},
332+
index=pd.MultiIndex.from_product((['a', 'b'], [0, 1]),
333+
names=['baz', None]))
334334
index = Index(['a', 'b'], name='baz')
335335
concatted_named_from_keys = pd.concat([df, df], keys=index)
336-
assert_equal(concatted_named_from_keys.index.names, FrozenList(['baz', None]))
336+
assert_frame_equal(concatted_named_from_keys, df_concatted)
337337
index_no_name = ['a', 'b']
338-
concatted_named_from_names = pd.concat([df, df], keys=index_no_name, names=['baz'])
339-
assert_equal(concatted_named_from_names.index.names, FrozenList(['baz', None]))
338+
concatted_named_from_names = pd.concat(
339+
[df, df], keys=index_no_name, names=['baz'])
340+
assert_frame_equal(concatted_named_from_names, df_concatted)
340341

341342

342343
class TestDataFrameCombineFirst(tm.TestCase, TestData):

0 commit comments

Comments
 (0)