Bug 1544423 - Fixup complex fuzzy reftest annotations, r=gsnedders
authorJames Graham <james@hoppipolla.co.uk>
Tue, 16 Apr 2019 17:20:06 +0000
changeset 469728 3ff5509484993431bdfe3664a7f18bc5cd512956
parent 469727 d0943c0f7615617c1c9be93eff9cfa0c6275bb97
child 469729 acfc18211adee353f3393b3976676d6a404bbe02
push id35880
push usercbrindusan@mozilla.com
push dateWed, 17 Apr 2019 09:36:19 +0000
treeherdermozilla-central@79e6ed0b08d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgsnedders
bugs1544423
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1544423 - Fixup complex fuzzy reftest annotations, r=gsnedders Differential Revision: https://phabricator.services.mozilla.com/D27507
testing/web-platform/meta/infrastructure/reftest/reftest_fuzzy_ini_full.html.ini
testing/web-platform/meta/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html.ini
testing/web-platform/meta/infrastructure/reftest/reftest_fuzzy_ini_short.html.ini
testing/web-platform/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy.html.ini
testing/web-platform/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_full.html.ini
testing/web-platform/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html.ini
testing/web-platform/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_short.html.ini
testing/web-platform/tests/infrastructure/reftest/reftest_fuzzy.html
testing/web-platform/tests/infrastructure/reftest/reftest_fuzzy_ini_full.html
testing/web-platform/tests/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html
testing/web-platform/tests/infrastructure/reftest/reftest_fuzzy_ini_short.html
testing/web-platform/tests/tools/wptrunner/wptrunner/wpttest.py
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/infrastructure/reftest/reftest_fuzzy_ini_full.html.ini
@@ -0,0 +1,3 @@
+[reftest_fuzzy_ini_full.html]
+  fuzzy: [maxDifference=1;100-100,
+          reftest_fuzzy_ini_full.html==fuzzy-ref-1.html:255;100]
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html.ini
@@ -0,0 +1,4 @@
+[reftest_fuzzy_ini_ref_only.html]
+  fuzzy: [maxDifference=1;100-100,
+          fuzzy-ref-1.html:maxDifference=255;100-100,
+          reftest_fuzzy==fuzzy-ref-2.html:maxDifference=1;100-100]
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/meta/infrastructure/reftest/reftest_fuzzy_ini_short.html.ini
@@ -0,0 +1,2 @@
+[reftest_fuzzy_ini_short.html]
+  fuzzy: maxDifference=255;100-100
deleted file mode 100644
--- a/testing/web-platform/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[reftest_fuzzy.html]
-  fuzzy: fuzzy-ref-1.html:maxDifference=255;100-100
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_full.html.ini
@@ -0,0 +1,3 @@
+[reftest_fuzzy_ini_full.html]
+  fuzzy: [maxDifference=1;100-100,
+          reftest_fuzzy_ini_full.html==fuzzy-ref-1.html:255;100]
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html.ini
@@ -0,0 +1,4 @@
+[reftest_fuzzy_ini_ref_only.html]
+  fuzzy: [maxDifference=1;100-100,
+          fuzzy-ref-1.html:maxDifference=255;100-100,
+          reftest_fuzzy==fuzzy-ref-2.html:maxDifference=1;100-100]
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/infrastructure/metadata/infrastructure/reftest/reftest_fuzzy_ini_short.html.ini
@@ -0,0 +1,2 @@
+[reftest_fuzzy_ini_short.html]
+  fuzzy: maxDifference=255;100-100
rename from testing/web-platform/tests/infrastructure/reftest/reftest_fuzzy.html
rename to testing/web-platform/tests/infrastructure/reftest/reftest_fuzzy_ini_full.html
copy from testing/web-platform/tests/infrastructure/reftest/reftest_fuzzy.html
copy to testing/web-platform/tests/infrastructure/reftest/reftest_fuzzy_ini_ref_only.html
copy from testing/web-platform/tests/infrastructure/reftest/reftest_fuzzy.html
copy to testing/web-platform/tests/infrastructure/reftest/reftest_fuzzy_ini_short.html
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/wpttest.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/wpttest.py
@@ -467,20 +467,22 @@ class ReftestTest(Test):
         for meta in reversed(list(self.itermeta(None))):
             value = meta.fuzzy
             if not value:
                 continue
             if atom_reset in value:
                 value.remove(atom_reset)
                 values = {}
             for key, data in value:
-                if len(key) == 3:
+                if isinstance(key, (tuple, list)):
+                    key = list(key)
                     key[0] = urlparse.urljoin(self.url, key[0])
                     key[1] = urlparse.urljoin(self.url, key[1])
-                else:
+                    key = tuple(key)
+                elif key:
                     # Key is just a relative url to a ref
                     key = urlparse.urljoin(self.url, key)
                 values[key] = data
         return values
 
 
 class WdspecTest(Test):