Changeset 238340 in webkit

Timestamp:

Nov 16, 2018 8:23:30 PM (5 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION (r238294): TestWebKitAPI.WKNavigation.ProcessCrashDuringCallback failing on iOS
​https://bugs.webkit.org/show_bug.cgi?id=191783

Reviewed by Chris Dumez.

Allow either WKErrorWebContentProcessTerminated or WKErrorWebViewInvalidated since the test
is closing WebView, thereby invalidating the view, which is racing with the process termination.

• TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm:

(TEST):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-11-16  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION (r238294): TestWebKitAPI.WKNavigation.ProcessCrashDuringCallback failing on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=191783
+
+        Reviewed by Chris Dumez.
+
+        Allow either WKErrorWebContentProcessTerminated or WKErrorWebViewInvalidated since the test
+        is closing WebView, thereby invalidating the view, which is racing with the process termination.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm:
+        (TEST):
+
 2018-11-16  Chris Dumez  <cdumez@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebContentProcessDidTerminate.mm

@@ -231 +231 @@
     [webView _getContentsAsStringWithCompletionHandler:^(NSString *contents, NSError *error) {
         if (!!error)
-            EXPECT_EQ(WKErrorWebContentProcessTerminated, error.code);
-        ++callbackCount;
-        if (callbackCount == 6)
-            calledAllCallbacks = true;
-    }];
-    [webView _getContentsAsStringWithCompletionHandler:^(NSString *contents, NSError *error) {
-        if (!!error)
-            EXPECT_EQ(WKErrorWebContentProcessTerminated, error.code);
-        ++callbackCount;
-        if (callbackCount == 6)
-            calledAllCallbacks = true;
-    }];
-    [webView _getContentsAsStringWithCompletionHandler:^(NSString *contents, NSError *error) {
-        if (!!error)
-            EXPECT_EQ(WKErrorWebContentProcessTerminated, error.code);
+            EXPECT_TRUE(error.code == WKErrorWebContentProcessTerminated || error.code == WKErrorWebViewInvalidated);
+        ++callbackCount;
+        if (callbackCount == 6)
+            calledAllCallbacks = true;
+    }];
+    [webView _getContentsAsStringWithCompletionHandler:^(NSString *contents, NSError *error) {
+        if (!!error)
+            EXPECT_TRUE(error.code == WKErrorWebContentProcessTerminated || error.code == WKErrorWebViewInvalidated);
+        ++callbackCount;
+        if (callbackCount == 6)
+            calledAllCallbacks = true;
+    }];
+    [webView _getContentsAsStringWithCompletionHandler:^(NSString *contents, NSError *error) {
+        if (!!error)
+            EXPECT_TRUE(error.code == WKErrorWebContentProcessTerminated || error.code == WKErrorWebViewInvalidated);
         [view _close]; // Calling _close will also invalidate all callbacks.
         ++callbackCount;
@@ -253 +253 @@
     [webView _getContentsAsStringWithCompletionHandler:^(NSString *contents, NSError *error) {
         if (!!error)
-            EXPECT_EQ(WKErrorWebContentProcessTerminated, error.code);
-        ++callbackCount;
-        if (callbackCount == 6)
-            calledAllCallbacks = true;
-    }];
-    [webView _getContentsAsStringWithCompletionHandler:^(NSString *contents, NSError *error) {
-        if (!!error)
-            EXPECT_EQ(WKErrorWebContentProcessTerminated, error.code);
-        ++callbackCount;
-        if (callbackCount == 6)
-            calledAllCallbacks = true;
-    }];
-    [webView _getContentsAsStringWithCompletionHandler:^(NSString *contents, NSError *error) {
-        if (!!error)
-            EXPECT_EQ(WKErrorWebContentProcessTerminated, error.code);
+            EXPECT_TRUE(error.code == WKErrorWebContentProcessTerminated || error.code == WKErrorWebViewInvalidated);
+        ++callbackCount;
+        if (callbackCount == 6)
+            calledAllCallbacks = true;
+    }];
+    [webView _getContentsAsStringWithCompletionHandler:^(NSString *contents, NSError *error) {
+        if (!!error)
+            EXPECT_TRUE(error.code == WKErrorWebContentProcessTerminated || error.code == WKErrorWebViewInvalidated);
+        ++callbackCount;
+        if (callbackCount == 6)
+            calledAllCallbacks = true;
+    }];
+    [webView _getContentsAsStringWithCompletionHandler:^(NSString *contents, NSError *error) {
+        if (!!error)
+            EXPECT_TRUE(error.code == WKErrorWebContentProcessTerminated || error.code == WKErrorWebViewInvalidated);
         ++callbackCount;
         if (callbackCount == 6)