@@ -89,6 +89,17 @@ def _pytest_pyfunc_call(obj, pyfuncitem):
89
89
return True
90
90
91
91
92
+ def generate_test_name (item ):
93
+ """
94
+ Generate a unique name for the hash for this test.
95
+ """
96
+ if item .cls is not None :
97
+ name = f"{ item .module .__name__ } .{ item .cls .__name__ } .{ item .name } "
98
+ else :
99
+ name = f"{ item .module .__name__ } .{ item .name } "
100
+ return name
101
+
102
+
92
103
def pytest_report_header (config , startdir ):
93
104
import matplotlib
94
105
import matplotlib .ft2font
@@ -287,7 +298,7 @@ def generate_filename(self, item):
287
298
Given a pytest item, generate the figure filename.
288
299
"""
289
300
if self .config .getini ('mpl-use-full-test-name' ):
290
- filename = self . generate_test_name (item ) + '.png'
301
+ filename = generate_test_name (item ) + '.png'
291
302
else :
292
303
compare = get_compare (item )
293
304
# Find test name to use as plot name
@@ -298,21 +309,11 @@ def generate_filename(self, item):
298
309
filename = str (pathify (filename ))
299
310
return filename
300
311
301
- def generate_test_name (self , item ):
302
- """
303
- Generate a unique name for the hash for this test.
304
- """
305
- if item .cls is not None :
306
- name = f"{ item .module .__name__ } .{ item .cls .__name__ } .{ item .name } "
307
- else :
308
- name = f"{ item .module .__name__ } .{ item .name } "
309
- return name
310
-
311
312
def make_test_results_dir (self , item ):
312
313
"""
313
314
Generate the directory to put the results in.
314
315
"""
315
- test_name = pathify (self . generate_test_name (item ))
316
+ test_name = pathify (generate_test_name (item ))
316
317
results_dir = self .results_dir / test_name
317
318
results_dir .mkdir (exist_ok = True , parents = True )
318
319
return results_dir
@@ -526,7 +527,7 @@ def compare_image_to_hash_library(self, item, fig, result_dir, summary=None):
526
527
pytest .fail (f"Can't find hash library at path { hash_library_filename } " )
527
528
528
529
hash_library = self .load_hash_library (hash_library_filename )
529
- hash_name = self . generate_test_name (item )
530
+ hash_name = generate_test_name (item )
530
531
baseline_hash = hash_library .get (hash_name , None )
531
532
summary ['baseline_hash' ] = baseline_hash
532
533
@@ -613,7 +614,7 @@ def pytest_runtest_call(self, item): # noqa
613
614
if remove_text :
614
615
remove_ticks_and_titles (fig )
615
616
616
- test_name = self . generate_test_name (item )
617
+ test_name = generate_test_name (item )
617
618
result_dir = self .make_test_results_dir (item )
618
619
619
620
summary = {
0 commit comments