Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5fcce2b

Browse files
Lorak-mmkdkropachev
authored andcommitted
test_types: Use new assertEqual for callbacks
1 parent 3841a33 commit 5fcce2b

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

‎tests/integration/standard/test_types.py

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,11 +1037,11 @@ def random_subtype_vector():
10371037
test_fn(observed2[idx], expected2[idx])
10381038

10391039
def test_round_trip_integers(self):
1040-
self._round_trip_test("int", partial(random.randint, 0, 2 ** 31), self.assertEqual)
1041-
self._round_trip_test("bigint", partial(random.randint, 0, 2 ** 63), self.assertEqual)
1042-
self._round_trip_test("smallint", partial(random.randint, 0, 2 ** 15), self.assertEqual)
1043-
self._round_trip_test("tinyint", partial(random.randint, 0, (2 ** 7) - 1), self.assertEqual)
1044-
self._round_trip_test("varint", partial(random.randint, 0, 2 ** 63), self.assertEqual)
1040+
self._round_trip_test("int", partial(random.randint, 0, 2 ** 31), assertEqual)
1041+
self._round_trip_test("bigint", partial(random.randint, 0, 2 ** 63), assertEqual)
1042+
self._round_trip_test("smallint", partial(random.randint, 0, 2 ** 15), assertEqual)
1043+
self._round_trip_test("tinyint", partial(random.randint, 0, (2 ** 7) - 1), assertEqual)
1044+
self._round_trip_test("varint", partial(random.randint, 0, 2 ** 63), assertEqual)
10451045

10461046
def test_round_trip_floating_point(self):
10471047
_almost_equal_test_fn = partial(pytest.approx, abs=1e-5)
@@ -1058,8 +1058,8 @@ def test_round_trip_text(self):
10581058
def _random_string():
10591059
return ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(24))
10601060

1061-
self._round_trip_test("ascii", _random_string, self.assertEqual)
1062-
self._round_trip_test("text", _random_string, self.assertEqual)
1061+
self._round_trip_test("ascii", _random_string, assertEqual)
1062+
self._round_trip_test("text", _random_string, assertEqual)
10631063

10641064
def test_round_trip_date_and_time(self):
10651065
_almost_equal_test_fn = partial(pytest.approx, abs=timedelta(seconds=1))
@@ -1070,13 +1070,13 @@ def _random_date():
10701070
def _random_time():
10711071
return _random_datetime().time()
10721072

1073-
self._round_trip_test("date", _random_date, self.assertEqual)
1074-
self._round_trip_test("time", _random_time, self.assertEqual)
1073+
self._round_trip_test("date", _random_date, assertEqual)
1074+
self._round_trip_test("time", _random_time, assertEqual)
10751075
self._round_trip_test("timestamp", _random_datetime, _almost_equal_test_fn)
10761076

10771077
def test_round_trip_uuid(self):
1078-
self._round_trip_test("uuid", uuid.uuid1, self.assertEqual)
1079-
self._round_trip_test("timeuuid", uuid.uuid1, self.assertEqual)
1078+
self._round_trip_test("uuid", uuid.uuid1, assertEqual)
1079+
self._round_trip_test("timeuuid", uuid.uuid1, assertEqual)
10801080

10811081
def test_round_trip_miscellany(self):
10821082
def _random_bytes():
@@ -1088,10 +1088,10 @@ def _random_duration():
10881088
def _random_inet():
10891089
return socket.inet_ntoa(_random_bytes())
10901090

1091-
self._round_trip_test("boolean", _random_boolean, self.assertEqual)
1092-
self._round_trip_test("duration", _random_duration, self.assertEqual)
1093-
self._round_trip_test("inet", _random_inet, self.assertEqual)
1094-
self._round_trip_test("blob", _random_bytes, self.assertEqual)
1091+
self._round_trip_test("boolean", _random_boolean, assertEqual)
1092+
self._round_trip_test("duration", _random_duration, assertEqual)
1093+
self._round_trip_test("inet", _random_inet, assertEqual)
1094+
self._round_trip_test("blob", _random_bytes, assertEqual)
10951095

10961096
def test_round_trip_collections(self):
10971097
def _random_seq():
@@ -1102,32 +1102,32 @@ def _random_map():
11021102
return {k:v for (k,v) in zip(_random_seq(), _random_seq())}
11031103

11041104
# Goal here is to test collections of both fixed and variable size subtypes
1105-
self._round_trip_test("list<int>", _random_seq, self.assertEqual)
1106-
self._round_trip_test("list<varint>", _random_seq, self.assertEqual)
1107-
self._round_trip_test("set<int>", _random_set, self.assertEqual)
1108-
self._round_trip_test("set<varint>", _random_set, self.assertEqual)
1109-
self._round_trip_test("map<int,int>", _random_map, self.assertEqual)
1110-
self._round_trip_test("map<int,varint>", _random_map, self.assertEqual)
1111-
self._round_trip_test("map<varint,int>", _random_map, self.assertEqual)
1112-
self._round_trip_test("map<varint,varint>", _random_map, self.assertEqual)
1105+
self._round_trip_test("list<int>", _random_seq, assertEqual)
1106+
self._round_trip_test("list<varint>", _random_seq, assertEqual)
1107+
self._round_trip_test("set<int>", _random_set, assertEqual)
1108+
self._round_trip_test("set<varint>", _random_set, assertEqual)
1109+
self._round_trip_test("map<int,int>", _random_map, assertEqual)
1110+
self._round_trip_test("map<int,varint>", _random_map, assertEqual)
1111+
self._round_trip_test("map<varint,int>", _random_map, assertEqual)
1112+
self._round_trip_test("map<varint,varint>", _random_map, assertEqual)
11131113

11141114
def test_round_trip_vector_of_vectors(self):
11151115
def _random_vector():
11161116
return [random.randint(0,100000) for _ in range(2)]
11171117

1118-
self._round_trip_test("vector<int,2>", _random_vector, self.assertEqual)
1119-
self._round_trip_test("vector<varint,2>", _random_vector, self.assertEqual)
1118+
self._round_trip_test("vector<int,2>", _random_vector, assertEqual)
1119+
self._round_trip_test("vector<varint,2>", _random_vector, assertEqual)
11201120

11211121
def test_round_trip_tuples(self):
11221122
def _random_tuple():
11231123
return (random.randint(0,100000),random.randint(0,100000))
11241124

11251125
# Unfortunately we can't use positional parameters when inserting tuples because the driver will try to encode
11261126
# them as lists before sending them to the server... and that confuses the parsing logic.
1127-
self._round_trip_test("tuple<int,int>", _random_tuple, self.assertEqual, use_positional_parameters=False)
1128-
self._round_trip_test("tuple<int,varint>", _random_tuple, self.assertEqual, use_positional_parameters=False)
1129-
self._round_trip_test("tuple<varint,int>", _random_tuple, self.assertEqual, use_positional_parameters=False)
1130-
self._round_trip_test("tuple<varint,varint>", _random_tuple, self.assertEqual, use_positional_parameters=False)
1127+
self._round_trip_test("tuple<int,int>", _random_tuple, assertEqual, use_positional_parameters=False)
1128+
self._round_trip_test("tuple<int,varint>", _random_tuple, assertEqual, use_positional_parameters=False)
1129+
self._round_trip_test("tuple<varint,int>", _random_tuple, assertEqual, use_positional_parameters=False)
1130+
self._round_trip_test("tuple<varint,varint>", _random_tuple, assertEqual, use_positional_parameters=False)
11311131

11321132
def test_round_trip_udts(self):
11331133
def _udt_equal_test_fn(udt1, udt2):

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /