Handle errors other than Timeout in keyword 'Handle Alert' (robotframework#1501)

Zeckie · aaltat · commit ac49c0a5b723 · 2019-11-02T22:29:12.000+02:00
Raise the current exception only for TimeoutException and add new except block for WebDriverException. robotframework#1500
diff --git a/atest/acceptance/keywords/alerts.robot b/atest/acceptance/keywords/alerts.robot
@@ -120,6 +120,16 @@ Alert Should Be Present with custom timeout
     ...    Alert Should Be Present    timeout=1ms
     Alert Should Be Present    Alert after 500ms!    ACCEPT    3s
 
+Handle Alert when popup window closes
+    [Documentation]    Popup window is closed by javascript while
+    ...    'Handle Alert' keyword is waiting for alert
+    ...    FAIL GLOB: An exception occurred waiting for alert*
+    [Setup]    Go To Page "javascript/self_closing_popup.html"
+    Click Button    Self Closing
+    ${handle} =    Switch Window   NEW
+    Handle Alert  timeout=10s
+    [Teardown]    Switch Window    ${handle}
+
 *** Keywords ***
 Wait For Title Change
     [Arguments]    ${expected}
diff --git a/atest/resources/html/javascript/self_closing_popup.html b/atest/resources/html/javascript/self_closing_popup.html
@@ -0,0 +1,17 @@
+<html>
+    <head>
+        <title>Self Closing Popup</title>
+        <script type="text/javascript">
+            function openCloseAfterDelay() {
+                var popupWindow = window.open("alert.html");
+                window.setTimeout(function(){
+                    popupWindow.close();
+                },500);
+            }
+        </script>
+    </head>
+    <body>
+		<p>When you click this button, another window / tab will open and automatically close 0.5s later</p>
+        <button onclick="openCloseAfterDelay()">Self Closing</button>
+    </body>
+</html>
diff --git a/src/SeleniumLibrary/keywords/alert.py b/src/SeleniumLibrary/keywords/alert.py
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from selenium.common.exceptions import WebDriverException
+from selenium.common.exceptions import TimeoutException, WebDriverException
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 
@@ -133,6 +133,9 @@ def _wait_alert(self, timeout=None):
         wait = WebDriverWait(self.driver, timeout)
         try:
             return wait.until(EC.alert_is_present())
-        except WebDriverException:
+        except TimeoutException:
             raise AssertionError('Alert not found in %s.'
-                                 % secs_to_timestr(timeout))
+                             % secs_to_timestr(timeout))
+        except WebDriverException as err:
+            raise AssertionError('An exception occurred waiting for alert: %s'
+                                 % err)
