[css-multicol] Use "Ahem" instead of "ahem" in tests

"ahem" is causing flakiness on Windows, so this patch just replaces "ahem" by "Ahem" on WPT tests. BUG=724392,794136 Change-Id: I55ce2ee7ed36b2708da571f52256716e97a072cb Reviewed-on: https://chromium-review.googlesource.com/940921 Reviewed-by: Morten Stenshorne <mstensho@chromium.org> Commit-Queue: Manuel Rego Casasnovas <rego@igalia.com> Cr-Commit-Position: refs/heads/master@{#539780}
Denger-Network · Feb 28, 2018 · df22bb0 · df22bb0
1 parent 6597a03
commit df22bb0
Show file tree

Hide file tree

Showing 23 changed files with 23 additions and 40 deletions.
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
@@ -2308,14 +2308,6 @@ crbug.com/792437 external/wpt/css/css-multicol/multicol-rule-inset-000.xht [ Fai
 crbug.com/792437 external/wpt/css/css-multicol/multicol-rule-outset-000.xht [ Failure ]
 crbug.com/636055 external/wpt/css/css-multicol/multicol-span-all-margin-nested-002.xht [ Failure ]
 crbug.com/792446 external/wpt/css/css-multicol/multicol-span-float-001.xht [ Failure ]
-crbug.com/794136 [ Win ] external/wpt/css/css-multicol/multicol-fill-balance-001.xht [ Pass Failure ]
-crbug.com/794136 [ Win ] external/wpt/css/css-multicol/multicol-gap-negative-001.xht [ Pass Failure ]
-crbug.com/794136 [ Win ] external/wpt/css/css-multicol/multicol-overflow-000.xht [ Pass Failure ]
-crbug.com/794136 [ Win ] external/wpt/css/css-multicol/multicol-overflowing-001.xht [ Pass Failure ]
-crbug.com/794136 [ Win ] external/wpt/css/css-multicol/multicol-rule-002.xht [ Pass Failure ]
-crbug.com/794136 [ Win ] external/wpt/css/css-multicol/multicol-rule-shorthand-2.xht [ Pass Failure ]
-crbug.com/794136 [ Win ] external/wpt/css/css-multicol/multicol-rule-stacking-001.xht [ Pass Failure ]
-crbug.com/794136 [ Win ] external/wpt/css/css-multicol/multicol-width-001.xht [ Pass Failure ]
 
 crbug.com/796733 [ Win ] external/wpt/css/css-ui/outline-004.html [ Pass Failure ]
 crbug.com/796733 [ Win ] external/wpt/css/css-ui/text-overflow-001.html [ Pass Failure ]
@@ -3453,15 +3445,6 @@ crbug.com/802835 virtual/outofblink-cors/external/wpt/fetch/corb/img-png-mislabe
 crbug.com/802835 external/wpt/fetch/corb/script-html-correctly-labeled.tentative.sub.html [ Failure ]
 crbug.com/802835 virtual/outofblink-cors/external/wpt/fetch/corb/script-html-correctly-labeled.tentative.sub.html [ Failure ]
 
-crbug.com/812941 [ Win7 ] external/wpt/css/css-multicol/multicol-columns-004.xht [ Failure Pass ]
-crbug.com/812941 [ Win7 ] external/wpt/css/css-multicol/multicol-count-non-integer-003.xht [ Failure Pass ]
-crbug.com/812941 [ Win7 ] external/wpt/css/css-multicol/multicol-gap-000.xht [ Failure Pass ]
-crbug.com/812941 [ Win7 ] external/wpt/css/css-multicol/multicol-height-block-child-001.xht [ Failure Pass ]
-crbug.com/812941 [ Win7 ] external/wpt/css/css-multicol/multicol-inherit-003.xht [ Failure Pass ]
-crbug.com/812941 [ Win7 ] external/wpt/css/css-multicol/multicol-rule-color-inherit-001.xht [ Failure Pass ]
-crbug.com/812941 [ Win7 ] external/wpt/css/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht [ Failure Pass ]
-crbug.com/812941 [ Win7 ] external/wpt/css/css-multicol/multicol-table-cell-vertical-align-001.xht [ Failure Pass ]
-
 crbug.com/813704 [ Win7 Mac ] http/tests/images/png-partial-load-as-document.html [ Failure Pass ]
 
 crbug.com/815050 [ Mac ] http/tests/serviceworker/chromium/memory-cache.html [ Failure Pass ]

diff --git a/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-fill-auto-002-ref.xht b/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-fill-auto-002-ref.xht
@@ -7,7 +7,7 @@
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1.25em;
 	line-height: 1em;
 	color: green;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-fill-auto-002.xht b/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-fill-auto-002.xht
@@ -10,7 +10,7 @@
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1.25em;
 	line-height: 1em;
 	color: green;

diff --git a/..._party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-fill-balance-001-ref.xht b/..._party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-fill-balance-001-ref.xht
@@ -7,7 +7,7 @@
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1.25em;
 	line-height: 1em;
 	color: green;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-fill-balance-001.xht b/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-fill-balance-001.xht
@@ -10,7 +10,7 @@
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1.25em;
 	line-height: 1em;
 	color: green;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-inherit-003.xht b/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-inherit-003.xht
@@ -16,7 +16,7 @@ body>div {
 	column-width: 8em;
 }
 div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: black;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-inherit-3-ref.xht b/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-inherit-3-ref.xht
@@ -22,7 +22,7 @@ div div {
 #two {left: 19em;}
 #three {left: 38em;}
 div div div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	line-height: 1em;
 	width: 2em;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-002.xht b/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-002.xht
@@ -12,7 +12,7 @@ body {
 	margin: 0;
 }
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: black;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-fraction-003.xht b/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-fraction-003.xht
@@ -12,7 +12,7 @@ body {
 	margin: 0;
 }
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: black;

diff --git a/...d_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-fraction-3-ref.xht b/...d_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-fraction-3-ref.xht
@@ -9,7 +9,7 @@ body {
 	margin: 0;
 }
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: black;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-px-001.xht b/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-px-001.xht
@@ -12,7 +12,7 @@ body {
 	margin: 0;
 }
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: black;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-ref.xht b/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-ref.xht
@@ -9,7 +9,7 @@ body {
 	margin: 0;
 }
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: black;

diff --git a/..._party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-shorthand-2-ref.xht b/..._party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-shorthand-2-ref.xht
@@ -7,7 +7,7 @@ body {
 	margin: 0;
 }
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: black;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-shorthand-2.xht b/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-shorthand-2.xht
@@ -12,7 +12,7 @@ body {
 	margin: 0;
 }
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: black;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-stacking-001.xht b/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-stacking-001.xht
@@ -12,7 +12,7 @@ body {
 	margin: 0;
 }
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: blue;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-stacking-ref.xht b/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-rule-stacking-ref.xht
@@ -9,7 +9,7 @@ body {
 	margin: 0;
 }
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: black;

diff --git a/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-shorthand-001.xht b/third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-shorthand-001.xht
@@ -12,7 +12,7 @@ body {
 	margin: 0;
 }
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: black;

diff --git a/.../WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-span-all-block-sibling-003.xht b/.../WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-span-all-block-sibling-003.xht
@@ -9,7 +9,7 @@
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	line-height: 1;
 	color: black;

diff --git a/...ebKit/LayoutTests/external/wpt/css/css-multicol/multicol-span-all-block-sibling-3-ref.xht b/...ebKit/LayoutTests/external/wpt/css/css-multicol/multicol-span-all-block-sibling-3-ref.xht
@@ -6,7 +6,7 @@
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	line-height: 1;
 	color: black;

diff --git a/...outTests/external/wpt/css/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht b/...outTests/external/wpt/css/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht
@@ -12,7 +12,7 @@ body {
 	margin: 0;
 }
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: navy;
@@ -29,7 +29,7 @@ body>div {
 	column-gap: 0;
 }
 span, h6 {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	font-weight: normal;
 	line-height: 1em;

diff --git a/...outTests/external/wpt/css/css-multicol/multicol-span-all-margin-nested-firstchild-ref.xht b/...outTests/external/wpt/css/css-multicol/multicol-span-all-margin-nested-firstchild-ref.xht
@@ -9,7 +9,7 @@ body {
 	margin: 0;
 }
 body>div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 1em;
 	line-height: 1em;
 	color: navy;

diff --git a/...bKit/LayoutTests/external/wpt/css/css-multicol/multicol-table-cell-vertical-align-001.xht b/...bKit/LayoutTests/external/wpt/css/css-multicol/multicol-table-cell-vertical-align-001.xht
@@ -9,7 +9,7 @@
 <meta name="flags" content="ahem"/>
 <style type="text/css"><![CDATA[
 div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 20px;
 	line-height: 1em;
 	vertical-align: middle;

diff --git a/...bKit/LayoutTests/external/wpt/css/css-multicol/multicol-table-cell-vertical-align-ref.xht b/...bKit/LayoutTests/external/wpt/css/css-multicol/multicol-table-cell-vertical-align-ref.xht
@@ -6,7 +6,7 @@
 <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
 <style type="text/css"><![CDATA[
 div {
-	font-family: ahem;
+	font-family: Ahem;
 	font-size: 20px;
 	line-height: 1em;
 	vertical-align: middle;