Changeset 224044 in webkit

Timestamp:

Oct 26, 2017 1:22:13 PM (6 years ago)

Author:

Ryan Haddad

Message:

[MediaStream] Clear cached gUM prompt state
​https://bugs.webkit.org/show_bug.cgi?id=178754
<rdar://problem/32742356>

Unreviewed, fix a flakey test.

Patch by Eric Carlson <​eric.carlson@apple.com> on 2017-10-26

• TestWebKitAPI/Tests/WebKit/GetUserMediaReprompt.mm:

(-[GetUserMediaRepromptTestView haveStream:]): New, check several times for expected state.
(TestWebKitAPI::TEST): Don't assume stream state changes in the page immediately.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKit/GetUserMediaReprompt.mm (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-10-26  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] Clear cached gUM prompt state
+        https://bugs.webkit.org/show_bug.cgi?id=178754
+        <rdar://problem/32742356>
+
+        Unreviewed, fix a flakey test.
+
+        * TestWebKitAPI/Tests/WebKit/GetUserMediaReprompt.mm:
+        (-[GetUserMediaRepromptTestView haveStream:]): New, check several times for expected state.
+        (TestWebKitAPI::TEST): Don't assume stream state changes in the page immediately.
+
 2017-10-26  Andy Estes  <aestes@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit/GetUserMediaReprompt.mm

@@ -59 +59 @@
 @end
 
+@interface GetUserMediaRepromptTestView : TestWKWebView
+- (BOOL)haveStream:(BOOL)expected;
+@end
+
+@implementation GetUserMediaRepromptTestView
+- (BOOL)haveStream:(BOOL)expected
+{
+    int retryCount = 10;
+    while (retryCount--) {
+        auto result = [self stringByEvaluatingJavaScript:@"haveStream()"];
+        if (result.boolValue == expected)
+            return YES;
+
+        TestWebKitAPI::Util::spinRunLoop(10);
+    }
+
+    return NO;
+}
+@end
+
 namespace TestWebKitAPI {
 
@@ -69 +89 @@
     preferences._mediaDevicesEnabled = YES;
     preferences._mockCaptureDevicesEnabled = YES;
-    auto webView = [[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500) configuration:configuration.get() processPoolConfiguration:processPoolConfig.get()];
+    auto webView = [[GetUserMediaRepromptTestView alloc] initWithFrame:CGRectMake(0, 0, 320, 500) configuration:configuration.get() processPoolConfiguration:processPoolConfig.get()];
     auto delegate = adoptNS([[GetUserMediaRepromptUIDelegate alloc] init]);
     webView.UIDelegate = delegate.get();
@@ -77 +97 @@
     TestWebKitAPI::Util::run(&wasPrompted);
 
-    auto result = [webView stringByEvaluatingJavaScript:@"haveStream()"];
-    EXPECT_TRUE([result boolValue]);
+    EXPECT_TRUE([webView haveStream:YES]);
 
     [webView stringByEvaluatingJavaScript:@"stop()"];
-    result = [webView stringByEvaluatingJavaScript:@"haveStream()"];
-    EXPECT_FALSE([result boolValue]);
+    EXPECT_TRUE([webView haveStream:NO]);
 
     wasPrompted = false;
     [webView stringByEvaluatingJavaScript:@"promptForCapture()"];
-    result = [webView stringByEvaluatingJavaScript:@"haveStream()"];
-    EXPECT_TRUE([result boolValue]);
+    EXPECT_TRUE([webView haveStream:YES]);
     EXPECT_FALSE(wasPrompted);
 
     preferences._inactiveMediaCaptureSteamRepromptIntervalInMinutes = .5 / 60;
     [webView stringByEvaluatingJavaScript:@"stop()"];
-    result = [webView stringByEvaluatingJavaScript:@"haveStream()"];
-    EXPECT_FALSE([result boolValue]);
+    EXPECT_TRUE([webView haveStream:NO]);
 
     // Sleep long enough for the reprompt timer to fire and clear cached state.
@@ -101 +117 @@
     [webView stringByEvaluatingJavaScript:@"promptForCapture()"];
     TestWebKitAPI::Util::run(&wasPrompted);
-    result = [webView stringByEvaluatingJavaScript:@"haveStream()"];
-    EXPECT_TRUE([result boolValue]);
+    EXPECT_TRUE([webView haveStream:YES]);
 }