@@ -418,11 +418,11 @@ def teardown(self):
418418 def logger (self ):
419419 return self .executor .logger
420420
421- def get_hash (self , test , viewport_size , dpi , page_ranges ):
421+ def get_hash (self , test , viewport_size , dpi , page_ranges , safe_printable_inset ):
422422 key = (test .url , viewport_size , dpi )
423423
424424 if key not in self .screenshot_cache :
425- success , data = self .get_screenshot_list (test , viewport_size , dpi , page_ranges )
425+ success , data = self .get_screenshot_list (test , viewport_size , dpi , page_ranges , safe_printable_inset )
426426
427427 if not success :
428428 return False , data
@@ -524,9 +524,9 @@ def run_test(self, test):
524524 viewport_size = test .viewport_size
525525 dpi = test .dpi
526526 page_ranges = test .page_ranges
527+ safe_printable_inset = test .safe_printable_inset
527528 self .message = []
528529
529-
530530 # Depth-first search of reference tree, with the goal
531531 # of reachings a leaf node with only pass results
532532
@@ -541,7 +541,7 @@ def run_test(self, test):
541541 fuzzy = self .get_fuzzy (test , nodes , relation )
542542
543543 for i , node in enumerate (nodes ):
544- success , data = self .get_hash (node , viewport_size , dpi , page_ranges )
544+ success , data = self .get_hash (node , viewport_size , dpi , page_ranges , safe_printable_inset )
545545 if success is False :
546546 return {"status" : data [0 ], "message" : data [1 ]}
547547
@@ -575,7 +575,7 @@ def run_test(self, test):
575575
576576 for i , (node , screenshot ) in enumerate (zip (nodes , screenshots )):
577577 if screenshot is None :
578- success , screenshot = self .retake_screenshot (node , viewport_size , dpi , page_ranges )
578+ success , screenshot = self .retake_screenshot (node , viewport_size , dpi , page_ranges , safe_printable_inset )
579579 if success :
580580 screenshots [i ] = screenshot
581581
@@ -606,11 +606,12 @@ def get_fuzzy(self, root_test, test_nodes, relation):
606606 break
607607 return value
608608
609- def retake_screenshot (self , node , viewport_size , dpi , page_ranges ):
609+ def retake_screenshot (self , node , viewport_size , dpi , page_ranges , safe_printable_inset ):
610610 success , data = self .get_screenshot_list (node ,
611611 viewport_size ,
612612 dpi ,
613- page_ranges )
613+ page_ranges ,
614+ safe_printable_inset )
614615 if not success :
615616 return False , data
616617
@@ -641,8 +642,8 @@ def get_png_dimensions(
641642
642643 return struct .unpack (">LL" , image_data [16 :24 ])
643644
644- def get_screenshot_list (self , node , viewport_size , dpi , page_ranges ):
645- success , data = self .executor .screenshot (node , viewport_size , dpi , page_ranges )
645+ def get_screenshot_list (self , node , viewport_size , dpi , page_ranges , safe_printable_inset ):
646+ success , data = self .executor .screenshot (node , viewport_size , dpi , page_ranges , safe_printable_inset )
646647 viewport_size = (800 , 600 ) if viewport_size is None else viewport_size
647648 dpi = 96 if dpi is None else dpi
648649 dpcm = dpi / 2.54
0 commit comments