Unreviewed test fix after r201427.

https://bugs.webkit.org/show_bug.cgi?id=157423
<rdar://problem/23751632>

A debug assertion was firing during some test runs due to the Geolocation permission
being turned off during the test. The timer logic was originally written to assert
if the timer fired when permissions were disabled. But this is no longer valid,
because we expect the Geolocation system to be active and become deactivated if the
browsing context violates one of the security criteria.

* DumpRenderTree/mac/UIDelegate.mm:
(-[UIDelegate timerFired]): Remove invalid assertion.

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 991d910..1200633 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2016-05-26  Brent Fulgham  <bfulgham@apple.com>
+
+        Unreviewed test fix after r201427.
+        https://bugs.webkit.org/show_bug.cgi?id=157423
+        <rdar://problem/23751632>
+
+        A debug assertion was firing during some test runs due to the Geolocation permission
+        being turned off during the test. The timer logic was originally written to assert
+        if the timer fired when permissions were disabled. But this is no longer valid,
+        because we expect the Geolocation system to be active and become deactivated if the
+        browsing context violates one of the security criteria.
+
+        * DumpRenderTree/mac/UIDelegate.mm:
+        (-[UIDelegate timerFired]): Remove invalid assertion.
+
 2016-05-26  Filip Pizlo  <fpizlo@apple.com>
 
         ScopedLambda should have a lifetime story that makes sense to the compiler

diff --git a/Tools/DumpRenderTree/mac/UIDelegate.mm b/Tools/DumpRenderTree/mac/UIDelegate.mm
index 3c2897f..18a58ce 100644 (file)
--- a/Tools/DumpRenderTree/mac/UIDelegate.mm
+++ b/Tools/DumpRenderTree/mac/UIDelegate.mm
@@ -266,7 +266,6 @@ DumpRenderTreeDraggingInfo *draggingInfo = nil;
 
 - (void)timerFired
 {
-    ASSERT(gTestRunner->isGeolocationPermissionSet());
     m_timer = 0;
     NSEnumerator* enumerator = [m_pendingGeolocationPermissionListeners objectEnumerator];
     id<WebAllowDenyPolicyListener> listener;