Skip to content

Commit fea766a

Browse files
committed
fixing test cases: because the values were the same, the order was not unique/stable (obviously depends on hash-values of keys), ensure unique ordering
1 parent c4f1eca commit fea766a

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

pandas/tests/base/test_value_counts.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,18 +232,14 @@ def test_value_counts_datetime64(index_or_series):
232232

233233
# with NaT
234234
s = df["dt"].copy()
235-
s = klass(list(s.values) + [pd.NaT])
235+
s = klass(list(s.values) + [pd.NaT] * 4)
236236

237237
result = s.value_counts()
238238
assert result.index.dtype == "datetime64[ns]"
239239
tm.assert_series_equal(result, expected_s)
240240

241241
result = s.value_counts(dropna=False)
242-
# GH 35922. NaN-like now sorts to the beginning of duplicate counts
243-
idx = pd.to_datetime(
244-
["2010-01-01 00:00:00", "2008-09-09 00:00:00", pd.NaT, "2009-01-01 00:00:00"]
245-
)
246-
expected_s = Series([3, 2, 1, 1], index=idx)
242+
expected_s = pd.concat([pd.Series([4], index=DatetimeIndex([pd.NaT])), expected_s])
247243
tm.assert_series_equal(result, expected_s)
248244

249245
unique = s.unique()

pandas/tests/test_algos.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,12 +1173,12 @@ def test_dropna(self):
11731173
)
11741174

11751175
tm.assert_series_equal(
1176-
Series([True, True, False, None]).value_counts(dropna=True),
1177-
Series([2, 1], index=[True, False]),
1176+
Series([True] * 3 + [False] * 2 + [None] * 5).value_counts(dropna=True),
1177+
Series([3, 2], index=[True, False]),
11781178
)
11791179
tm.assert_series_equal(
1180-
Series([True, True, False, None]).value_counts(dropna=False),
1181-
Series([2, 1, 1], index=[True, np.nan, False]),
1180+
Series([True] * 5 + [False] * 3 + [None] * 2).value_counts(dropna=False),
1181+
Series([5, 3, 2], index=[True, False, np.nan]),
11821182
)
11831183
tm.assert_series_equal(
11841184
Series([10.3, 5.0, 5.0]).value_counts(dropna=True),
@@ -1194,26 +1194,24 @@ def test_dropna(self):
11941194
Series([2, 1], index=[5.0, 10.3]),
11951195
)
11961196

1197-
# 32-bit linux has a different ordering
1198-
if IS64:
1199-
result = Series([10.3, 5.0, 5.0, None]).value_counts(dropna=False)
1200-
expected = Series([2, 1, 1], index=[5.0, np.nan, 10.3])
1201-
tm.assert_series_equal(result, expected)
1197+
result = Series([10.3, 10.3, 5.0, 5.0, 5.0, None]).value_counts(dropna=False)
1198+
expected = Series([3, 2, 1], index=[5.0, 10.3, np.nan])
1199+
tm.assert_series_equal(result, expected)
12021200

12031201
def test_value_counts_normalized(self):
12041202
# GH12558
1205-
s = Series([1, 2, np.nan, np.nan, np.nan])
1203+
s = Series([1] * 2 + [2] * 3 + [np.nan] * 5)
12061204
dtypes = (np.float64, object, "M8[ns]")
12071205
for t in dtypes:
12081206
s_typed = s.astype(t)
12091207
result = s_typed.value_counts(normalize=True, dropna=False)
12101208
expected = Series(
1211-
[0.6, 0.2, 0.2], index=Series([np.nan, 1.0, 2.0], dtype=t)
1209+
[0.5, 0.3, 0.2], index=Series([np.nan, 2.0, 1.0], dtype=t)
12121210
)
12131211
tm.assert_series_equal(result, expected)
12141212

12151213
result = s_typed.value_counts(normalize=True, dropna=True)
1216-
expected = Series([0.5, 0.5], index=Series([1.0, 2.0], dtype=t))
1214+
expected = Series([0.6, 0.4], index=Series([2.0, 1.0], dtype=t))
12171215
tm.assert_series_equal(result, expected)
12181216

12191217
def test_value_counts_uint64(self):

0 commit comments

Comments
 (0)