Skip to content

Commit 23fe024

Browse files
committed
Merge pull request #4445 from jreback/hdf_fix
TST: test updates for testing
2 parents 575f6ce + 453ca77 commit 23fe024

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

pandas/util/testing.py

+8-10
Original file line numberDiff line numberDiff line change
@@ -130,25 +130,23 @@ def assert_isinstance(obj, class_type_or_tuple):
130130
"Expected object to be of type %r, found %r instead" % (
131131
type(obj), class_type_or_tuple))
132132

133+
def assert_equal(actual, expected, msg=""):
134+
assert expected == actual, "%s: %r != %r" % (msg, actual, expected)
133135

134136
def assert_index_equal(left, right):
135-
assert left.equals(
136-
right), "[index] left [{0}], right [{0}]".format(left, right)
137-
138-
137+
if not left.equals(right):
138+
raise AssertionError("[index] left [{0} {1}], right [{2} {3}]".format(left.dtype,
139+
left,
140+
right,
141+
right.dtype))
139142
def assert_attr_equal(attr, left, right):
140143
left_attr = getattr(left, attr, None)
141144
right_attr = getattr(right, attr, None)
142-
assert left_attr == right_attr, "[{0}] left [{1}], right [{2}]".format(
143-
attr,
144-
left_attr,
145-
right_attr)
146-
145+
assert_equal(left_attr,right_attr,"attr is not equal [{0}]" .format(attr))
147146

148147
def isiterable(obj):
149148
return hasattr(obj, '__iter__')
150149

151-
152150
def assert_isinstance(obj, class_type_or_tuple):
153151
"""asserts that obj is an instance of class_type_or_tuple"""
154152
assert isinstance(obj, class_type_or_tuple), (

0 commit comments

Comments
 (0)