Bug 1937201 [wpt PR 49685] - [wptrunner] Clear screenshot cache betwe…

…en retries, a=testonly

Automatic update from web-platform-tests
[wptrunner] Clear screenshot cache between retries (#49685)

Otherwise, the same incorrect result might be retrieved each attempt,
which defeats the retry's purpose.

Workaround for https://crbug.com/383612546
--

wpt-commits: 28cc3c22685edc5ee146f67c8eadc47494a123fe
wpt-pr: 49685

UltraBlame original commit: 1fb818ee8b5cf0624f307bc1b3adb7dccc4e7aa9

testing/web-platform/tests/tools/wptrunner/wptrunner/environment.py

@@ -1,4 +1,6 @@
 import
+collections
+import
 contextlib
 import
 errno
@@ -613,6 +615,21 @@
 (
 )
 
+self
+.
+screenshot_caches
+=
+collections
+.
+defaultdict
+(
+self
+.
+cache_manager
+.
+dict
+)
+
 self
 .
 stash
@@ -965,6 +982,47 @@
 =
 None
 
+def
+reset
+(
+self
+)
+:
+
+"
+"
+"
+Reset
+state
+between
+retry
+attempts
+to
+isolate
+failures
+.
+"
+"
+"
+
+for
+cache
+in
+self
+.
+screenshot_caches
+.
+values
+(
+)
+:
+
+cache
+.
+clear
+(
+)
+
 contextlib
 .
 contextmanager

testing/web-platform/tests/tools/wptrunner/wptrunner/executors/base.py

@@ -162,20 +162,26 @@
 )
 :
 
+screenshot_cache
+=
+test_environment
+.
+screenshot_caches
+[
+test_type
+subsuite
+.
+name
+]
+
 executor_kwargs
 [
 "
 screenshot_cache
 "
 ]
 =
-test_environment
-.
-cache_manager
-.
-dict
-(
-)
+screenshot_cache
 
 executor_kwargs
 [
@@ -2664,9 +2670,6 @@
 key
 =
 (
-self
-.
-subsuite
 test
 .
 url

testing/web-platform/tests/tools/wptrunner/wptrunner/wptrunner.py

@@ -1939,6 +1939,12 @@
 ]
 )
 
+test_environment
+.
+reset
+(
+)
+
 with
 ManagerGroup
 (