Unreviewed test gardening. Improved attempt to reduce flakiness of inspector/network...

* http/tests/inspector/network/har/har-page-expected.txt:
* http/tests/inspector/network/har/har-page.html:
Earlier filters were taking affect, so move these checks up.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@223899 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f854ce2..3b18496 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2017-10-24  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Unreviewed test gardening. Improved attempt to reduce flakiness of inspector/network/har tests.
+
+        * http/tests/inspector/network/har/har-page-expected.txt:
+        * http/tests/inspector/network/har/har-page.html:
+        Earlier filters were taking affect, so move these checks up.
+
 2017-10-24  Antti Koivisto  <antti@apple.com>
 
         Create inline wrappers for before/after pseudo elements that have display:contents

diff --git a/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt b/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt
index b024eea..bd281d1 100644 (file)
--- a/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt
+++ b/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt
@@ -43,15 +43,14 @@ HAR Page Test.
           "cookies": [],
           "headers": "<filtered>",
           "content": {
-            "size": 3044,
+            "size": 2923,
             "compression": 0,
             "mimeType": "text/html",
-            "text": "<filtered text (3044)>"
+            "text": "<filtered text (2923)>"
           },
           "redirectURL": "",
           "headersSize": "<filtered>",
-          "bodySize": "<filtered>",
-          "_transferSize": "<filtered>"
+          "bodySize": "<filtered>"
         },
         "cache": {},
         "timings": {
@@ -62,8 +61,7 @@ HAR Page Test.
           "send": "<filtered>",
           "wait": "<filtered>",
           "receive": "<filtered>"
-        },
-        "connection": "<filtered>"
+        }
       },
       {
         "pageref": "page_0",
@@ -93,8 +91,7 @@ HAR Page Test.
           },
           "redirectURL": "",
           "headersSize": "<filtered>",
-          "bodySize": "<filtered>",
-          "_transferSize": "<filtered>"
+          "bodySize": "<filtered>"
         },
         "cache": {},
         "timings": {

diff --git a/LayoutTests/http/tests/inspector/network/har/har-page.html b/LayoutTests/http/tests/inspector/network/har/har-page.html
index b4aff90..5fad7d0 100644 (file)
--- a/LayoutTests/http/tests/inspector/network/har/har-page.html
+++ b/LayoutTests/http/tests/inspector/network/har/har-page.html
@@ -13,6 +13,16 @@ function test()
             return value;
         }
 
+        // Cache may or may not have been used so remove optional fields which may or may not be set.
+        if (key === "connection")
+            return undefined;
+        if (key === "serverIPAddress")
+            return undefined;
+        if (key === "_transferSize")
+            return undefined;
+        if (key === "_fetchType")
+            return undefined;
+
         // Headers include dynamic data.
         if (key === "headers")
             return "<filtered>";
@@ -25,24 +35,10 @@ function test()
         if (key.endsWith("Size"))
             return "<filtered>";
 
-        // Connection identifier could be different.
-        if (key === "connection")
-            return "<filtered>";
-
         // Reduce the file contents.
         if (key === "text")
             return "<filtered text (" + value.length + ")>";
 
-        // Cache may or may not have been used so remove optional fields which may or may not be set.
-        if (key === "connection")
-            return undefined;
-        if (key === "serverIPAddress")
-            return undefined;
-        if (key === "_transferSize")
-            return undefined;
-        if (key === "_fetchType")
-            return undefined;        
-
         // Since cache may or may not be used, timing data may be variable.
         // NOTE: SSL should always be -1 for this test case.
         if (key === "time")