Skip to content

Commit a6708ed

Browse files
tgerdesnvtgerdesnv
authored
Resolve imprecise asserts (#657)
1 parent c76fefb commit a6708ed

9 files changed

+96
-113
lines changed

‎tests/test_config.py‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@ def test_config(self):
237237
config = self._evaluate_config(args, yaml_content)
238238

239239
# CLI flag has the highest priority
240-
self.assertTrue(
241-
config.get_all_config()['model_repository'] == 'cli_repository')
240+
self.assertEqual(config.get_all_config()['model_repository'],
241+
'cli_repository')
242242

243243
args = [
244244
'model-analyzer', 'profile', '-f', 'path-to-config-file',
@@ -248,8 +248,8 @@ def test_config(self):
248248
config = self._evaluate_config(args, yaml_content)
249249

250250
# If CLI flag doesn't exist, YAML config has the highest priority
251-
self.assertTrue(
252-
config.get_all_config()['model_repository'] == 'yaml_repository')
251+
self.assertEqual(config.get_all_config()['model_repository'],
252+
'yaml_repository')
253253

254254
args = ['model-analyzer', 'profile', '-f', 'path-to-config-file']
255255
yaml_content = 'model_repository: yaml_repository'
@@ -328,26 +328,26 @@ def test_range_and_list_values(self):
328328
- 3
329329
"""
330330
config = self._evaluate_config(args, yaml_content)
331-
self.assertTrue(config.get_all_config()['batch_sizes'] == [2, 3])
331+
self.assertEqual(config.get_all_config()['batch_sizes'], [2, 3])
332332
self.assertIsInstance(config.get_config()['batch_sizes'].field_type(),
333333
ConfigListNumeric)
334334

335335
yaml_content = """
336336
batch_sizes: 2
337337
"""
338338
config = self._evaluate_config(args, yaml_content)
339-
self.assertTrue(config.get_all_config()['batch_sizes'] == [2])
339+
self.assertEqual(config.get_all_config()['batch_sizes'], [2])
340340
self.assertIsInstance(config.get_config()['batch_sizes'].field_type(),
341341
ConfigListNumeric)
342342

343343
yaml_content = """
344344
concurrency: 2
345345
"""
346346
config = self._evaluate_config(args, yaml_content)
347-
self.assertTrue(config.get_all_config()['concurrency'] == [2])
347+
self.assertEqual(config.get_all_config()['concurrency'], [2])
348348
self.assertIsInstance(config.get_config()['concurrency'].field_type(),
349349
ConfigListNumeric)
350-
self.assertTrue(config.get_all_config()['batch_sizes'] == [1])
350+
self.assertEqual(config.get_all_config()['batch_sizes'], [1])
351351
self.assertIsInstance(config.get_config()['batch_sizes'].field_type(),
352352
ConfigListNumeric)
353353

@@ -357,8 +357,8 @@ def test_range_and_list_values(self):
357357
stop: 6
358358
"""
359359
config = self._evaluate_config(args, yaml_content)
360-
self.assertTrue(
361-
config.get_all_config()['batch_sizes'] == [2, 3, 4, 5, 6])
360+
self.assertEqual(config.get_all_config()['batch_sizes'],
361+
[2, 3, 4, 5, 6])
362362
self.assertIsInstance(config.get_config()['batch_sizes'].field_type(),
363363
ConfigListNumeric)
364364

@@ -369,7 +369,7 @@ def test_range_and_list_values(self):
369369
step: 2
370370
"""
371371
config = self._evaluate_config(args, yaml_content)
372-
self.assertTrue(config.get_all_config()['batch_sizes'] == [2, 4, 6])
372+
self.assertEqual(config.get_all_config()['batch_sizes'], [2, 4, 6])
373373
self.assertIsInstance(config.get_config()['batch_sizes'].field_type(),
374374
ConfigListNumeric)
375375

@@ -1007,28 +1007,28 @@ def test_error_messages(self):
10071007
result = re.search('.*\'start\'.*\'stop\'.*\'undefined_key\'.*',
10081008
config_message)
10091009

1010-
self.assertTrue(config_status.status() == CONFIG_PARSER_FAILURE)
1010+
self.assertEqual(config_status.status(), CONFIG_PARSER_FAILURE)
10111011
self.assertIsNotNone(config_message)
10121012
self.assertIsNotNone(result)
10131013

10141014
config_numeric = ConfigListNumeric(float)
10151015
config_numeric.set_name('key')
10161016
config_status = config_numeric.set_value({'start': 12, 'stop': 'two'})
10171017
print(config_message)
1018-
self.assertTrue(config_status.status() == CONFIG_PARSER_FAILURE)
1018+
self.assertEqual(config_status.status(), CONFIG_PARSER_FAILURE)
10191019

10201020
config_numeric = ConfigListNumeric(float)
10211021
config_numeric.set_name('key')
10221022
config_status = config_numeric.set_value({'start': 'five', 'stop': 2})
10231023
config_message = config_status.message()
10241024
print(config_message)
1025-
self.assertTrue(config_status.status() == CONFIG_PARSER_FAILURE)
1025+
self.assertEqual(config_status.status(), CONFIG_PARSER_FAILURE)
10261026

10271027
config_numeric = ConfigListNumeric(float)
10281028
config_numeric.set_name('key')
10291029
config_status = config_numeric.set_value({'start': 10, 'stop': 2})
10301030
print(config_status.message())
1031-
self.assertTrue(config_status.status() == CONFIG_PARSER_FAILURE)
1031+
self.assertEqual(config_status.status(), CONFIG_PARSER_FAILURE)
10321032

10331033
# ConfigUnion error message
10341034
config_union = ConfigUnion(
@@ -1039,54 +1039,54 @@ def test_error_messages(self):
10391039
# Dictionaries are not accepted.
10401040
config_status = config_union.set_value({'a': 'b'})
10411041
print(config_status.message())
1042-
self.assertTrue(config_status.status() == CONFIG_PARSER_FAILURE)
1042+
self.assertEqual(config_status.status(), CONFIG_PARSER_FAILURE)
10431043

10441044
# ConfigEnum
10451045
config_enum = ConfigEnum(['a', 'b'])
10461046
config_enum.set_name('key')
10471047
config_status = config_enum.set_value('c')
10481048
print(config_status.message())
1049-
self.assertTrue(config_status.status() == CONFIG_PARSER_FAILURE)
1049+
self.assertEqual(config_status.status(), CONFIG_PARSER_FAILURE)
10501050

10511051
# ConfigListGeneric
10521052
config_list_generic = ConfigListGeneric(ConfigPrimitive(float))
10531053
config_list_generic.set_name('key')
10541054
config_status = config_list_generic.set_value({'a': 'b'})
10551055
print(config_status.message())
1056-
self.assertTrue(config_status.status() == CONFIG_PARSER_FAILURE)
1056+
self.assertEqual(config_status.status(), CONFIG_PARSER_FAILURE)
10571057

10581058
# ConfigListString
10591059
config_list_string = ConfigListString()
10601060
config_list_string.set_name('key')
10611061
config_status = config_list_string.set_value({'a': 'b'})
10621062
print(config_status.message())
1063-
self.assertTrue(config_status.status() == CONFIG_PARSER_FAILURE)
1063+
self.assertEqual(config_status.status(), CONFIG_PARSER_FAILURE)
10641064

10651065
config_status = config_list_string.set_value([{'a': 'b'}])
10661066
print(config_status.message())
1067-
self.assertTrue(config_status.status() == CONFIG_PARSER_FAILURE)
1067+
self.assertEqual(config_status.status(), CONFIG_PARSER_FAILURE)
10681068

10691069
# ConfigObject
10701070
config_object = ConfigObject(schema={'key': ConfigPrimitive(float)})
10711071
config_object.set_name('key')
10721072
config_status = config_object.set_value({'undefiend_key': 2.0})
10731073
print(config_status.message())
1074-
self.assertTrue(config_status.status() == CONFIG_PARSER_FAILURE)
1074+
self.assertEqual(config_status.status(), CONFIG_PARSER_FAILURE)
10751075

10761076
config_status = config_object.set_value({'key': [1, 2, 3]})
10771077
print(config_status.message())
1078-
self.assertTrue(config_status.status() == CONFIG_PARSER_FAILURE)
1078+
self.assertEqual(config_status.status(), CONFIG_PARSER_FAILURE)
10791079

10801080
config_status = config_object.set_value([1, 2, 3])
10811081
print(config_status.message())
1082-
self.assertTrue(config_status.status() == CONFIG_PARSER_FAILURE)
1082+
self.assertEqual(config_status.status(), CONFIG_PARSER_FAILURE)
10831083

10841084
# ConfigPrimitive
10851085
config_primitive = ConfigPrimitive(float)
10861086
config_primitive.set_name('key')
10871087
config_status = config_primitive.set_value('a')
10881088
print(config_status.message())
1089-
self.assertTrue(config_status.status() == CONFIG_PARSER_FAILURE)
1089+
self.assertEqual(config_status.status(), CONFIG_PARSER_FAILURE)
10901090

10911091
def test_autofill(self):
10921092
args = [

‎tests/test_cpu_monitor.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ def test_record_cpu_memory(self):
7272
self.assertIsInstance(record.timestamp(), int)
7373

7474
# The number of records should be dividable by number of metrics
75-
self.assertTrue(len(records) % len(metrics) == 0)
76-
self.assertTrue(len(records) > 0)
75+
self.assertEqual(len(records) % len(metrics), 0)
76+
self.assertGreater(len(records), 0)
7777

7878
with self.assertRaises(TritonModelAnalyzerException):
7979
cpu_monitor.stop_recording_metrics()

‎tests/test_dcgm_monitor.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@ def test_record_memory(self):
6868
for record in records:
6969
self.assertIsInstance(record.device_uuid(), str)
7070
self.assertIsInstance(record.value(), float)
71-
self.assertTrue(record.value() == TEST_RECORD_VALUE)
71+
self.assertEqual(record.value(), TEST_RECORD_VALUE)
7272
self.assertIsInstance(record.timestamp(), int)
7373

7474
# The number of records should be dividable by number of metrics
75-
self.assertTrue(len(records) % len(metrics) == 0)
76-
self.assertTrue(len(records) > 0)
77-
self.assertTrue(
78-
records[-1].timestamp() - records[0].timestamp() >= monitoring_time)
75+
self.assertEqual(len(records) % len(metrics), 0)
76+
self.assertGreater(len(records), 0)
77+
self.assertGreaterEqual(
78+
records[-1].timestamp() - records[0].timestamp(), monitoring_time)
7979

8080
with self.assertRaises(TritonModelAnalyzerException):
8181
dcgm_monitor.stop_recording_metrics()
@@ -100,14 +100,14 @@ def test_record_power(self):
100100
for record in records:
101101
self.assertIsInstance(record.device_uuid(), str)
102102
self.assertIsInstance(record.value(), float)
103-
self.assertTrue(record.value() == TEST_RECORD_VALUE)
103+
self.assertEqual(record.value(), TEST_RECORD_VALUE)
104104
self.assertIsInstance(record.timestamp(), int)
105105

106106
# The number of records should be dividable by number of metrics
107-
self.assertTrue(len(records) % len(metrics) == 0)
108-
self.assertTrue(len(records) > 0)
109-
self.assertTrue(
110-
records[-1].timestamp() - records[0].timestamp() >= monitoring_time)
107+
self.assertEqual(len(records) % len(metrics), 0)
108+
self.assertGreater(len(records), 0)
109+
self.assertGreaterEqual(
110+
records[-1].timestamp() - records[0].timestamp(), monitoring_time)
111111

112112
dcgm_monitor.destroy()
113113

@@ -125,15 +125,15 @@ def test_record_utilization(self):
125125
for record in records:
126126
self.assertIsInstance(record.device_uuid(), str)
127127
self.assertIsInstance(record.value(), float)
128-
self.assertTrue(record.value() <= 100)
129-
self.assertTrue(record.value() == TEST_RECORD_VALUE)
128+
self.assertLessEqual(record.value(), 100)
129+
self.assertEqual(record.value(), TEST_RECORD_VALUE)
130130
self.assertIsInstance(record.timestamp(), int)
131131

132132
# The number of records should be dividable by number of metrics
133-
self.assertTrue(len(records) % len(metrics) == 0)
134-
self.assertTrue(len(records) > 0)
135-
self.assertTrue(
136-
records[-1].timestamp() - records[0].timestamp() >= monitoring_time)
133+
self.assertEqual(len(records) % len(metrics), 0)
134+
self.assertGreater(len(records), 0)
135+
self.assertGreaterEqual(
136+
records[-1].timestamp() - records[0].timestamp(), monitoring_time)
137137

138138
dcgm_monitor.destroy()
139139

‎tests/test_model_config.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,16 +176,16 @@ def test_create_from_file(self):
176176
mock_model_config = MockModelConfig(test_protobuf)
177177
mock_model_config.start()
178178
model_config = ModelConfig._create_from_file('/path/to/model_config')
179-
self.assertTrue(model_config.get_config() == self._model_config)
179+
self.assertEqual(model_config.get_config(), self._model_config)
180180
mock_model_config.stop()
181181

182182
def test_create_from_dict(self):
183183
model_config = ModelConfig.create_from_dictionary(self._model_config)
184-
self.assertTrue(model_config.get_config() == self._model_config)
184+
self.assertEqual(model_config.get_config(), self._model_config)
185185

186186
new_config = {'instance_group': [{'count': 2, 'kind': 'KIND_CPU'}]}
187187
model_config.set_config(new_config)
188-
self.assertTrue(model_config.get_config() == new_config)
188+
self.assertEqual(model_config.get_config(), new_config)
189189

190190
def test_write_config_file(self):
191191
model_config = ModelConfig.create_from_dictionary(self._model_config)
@@ -207,8 +207,8 @@ def test_write_config_file(self):
207207
mock_model_config.start()
208208
model_config_from_file = \
209209
ModelConfig._create_from_file(model_output_path)
210-
self.assertTrue(
211-
model_config_from_file.get_config() == self._model_config)
210+
self.assertEqual(model_config_from_file.get_config(),
211+
self._model_config)
212212
mock_model_config.stop()
213213

214214
# output path doesn't exist

‎tests/test_model_config_measurement.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def test_calculate_weighted_percentage_gain(self):
154154
"perf_throughput": 1,
155155
"perf_latency_p99": 1
156156
})
157-
self.assertTrue(self.mcmA == self.mcmB)
157+
self.assertEqual(self.mcmA, self.mcmB)
158158
self.assertEqual(
159159
self.mcmA.calculate_weighted_percentage_gain(self.mcmB), 25)
160160
self.assertEqual(
@@ -168,13 +168,13 @@ def test_is_better_than(self):
168168

169169
# throughput: 1000 is not better than 2000
170170
self.assertFalse(self.mcmA.is_better_than(self.mcmB))
171-
self.assertTrue(self.mcmA < self.mcmB)
171+
self.assertLess(self.mcmA, self.mcmB)
172172

173173
self.mcmA.set_metric_weighting({"perf_latency_p99": 1})
174174

175175
# latency: 20 is better than 40
176176
self.assertTrue(self.mcmA.is_better_than(self.mcmB))
177-
self.assertFalse(self.mcmA < self.mcmB)
177+
self.assertGreater(self.mcmA, self.mcmB)
178178

179179
def test_is_better_than_combo(self):
180180
"""
@@ -198,15 +198,15 @@ def test_is_better_than_empty(self):
198198

199199
self.assertTrue(self.mcmA.is_better_than(self.mcmC))
200200
self.assertFalse(self.mcmC.is_better_than(self.mcmA))
201-
self.assertTrue(self.mcmC == self.mcmD)
201+
self.assertEqual(self.mcmC, self.mcmD)
202202

203203
def test__eq__(self):
204204
"""
205205
Test that individual metric equality works as expected
206206
"""
207207
self.mcmA.set_metric_weighting({"cpu_used_ram": 10})
208208

209-
self.assertTrue(self.mcmA == self.mcmB)
209+
self.assertEqual(self.mcmA, self.mcmB)
210210

211211
def test__eq__combo(self):
212212
"""
@@ -219,7 +219,7 @@ def test__eq__combo(self):
219219
"perf_latency_p99": 1
220220
})
221221

222-
self.assertTrue(self.mcmA == self.mcmB)
222+
self.assertEqual(self.mcmA, self.mcmB)
223223

224224
def test_from_dict(self):
225225
"""

‎tests/test_perf_analyzer.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -435,9 +435,9 @@ def test_run(self):
435435

436436
records = perf_analyzer.get_gpu_records()
437437
self.assertEqual(len(records), 3)
438-
self.assertTrue(type(records[0]) == GPUUsedMemory)
439-
self.assertTrue(type(records[1]) == GPUUsedMemory)
440-
self.assertTrue(type(records[2]) == GPUFreeMemory)
438+
self.assertEqual(type(records[0]), GPUUsedMemory)
439+
self.assertEqual(type(records[1]), GPUUsedMemory)
440+
self.assertEqual(type(records[2]), GPUFreeMemory)
441441
self.assertEqual(records[2].device_uuid(), "GPU-aaf4fea0")
442442
self.assertEqual(records[2].value(), 1500 - 1000)
443443

‎tests/test_record_types.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,17 +136,17 @@ def test_compare(self):
136136

137137
# Test __lt__ (True if 1 worse than 2)
138138
if record_type in self.less_is_better_types:
139-
self.assertTrue(metric1 < metric2)
139+
self.assertLess(metric1, metric2)
140140
elif record_type in self.more_is_better_types:
141-
self.assertTrue(metric2 < metric1)
141+
self.assertLess(metric2, metric1)
142142
else:
143143
fail
144144

145145
# Test __gt__ (True if 1 better than 2)
146146
if record_type in self.less_is_better_types:
147-
self.assertTrue(metric2 > metric1)
147+
self.assertLess(metric1, metric2)
148148
elif record_type in self.more_is_better_types:
149-
self.assertTrue(metric1 > metric2)
149+
self.assertGreater(metric1, metric2)
150150
else:
151151
fail
152152

‎tests/test_result_table_manager.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def test_create_inference_table_with_backend_parameters(self):
131131
result_manager=result_manager)
132132

133133
result_table_manager._create_inference_table()
134-
self.assertTrue(result_table_manager._inference_output_fields == [
134+
self.assertEqual(result_table_manager._inference_output_fields, [
135135
'model_name', 'batch_size', 'backend_parameter/parameter_1',
136136
'backend_parameter/parameter_2'
137137
])
@@ -222,7 +222,7 @@ def test_get_common_row_items_with_backend_parameters(self):
222222
instance_groups=None,
223223
max_batch_sizes=None,
224224
backend_parameters=backend_parameters)
225-
self.assertTrue(row == [
225+
self.assertEqual(row, [
226226
'model_name', 'batch_size', 'model_1_value_1', 'model_1_value_2',
227227
None
228228
])

0 commit comments

Comments
 (0)