[py] Add detailed error message if KeyError thrown in get_window_size and get_window_position (SeleniumHQ#15503)

Author: aikfiend

py/selenium/webdriver/remote/webdriver.py

@@ -1044,7 +1044,10 @@ def get_window_size(self, windowHandle: str = "current") -> dict:
         if size.get("value", None):
             size = size["value"]
 
-        return {k: size[k] for k in ("width", "height")}
+        try:
+            return {k: size[k] for k in ("width", "height")}
+        except KeyError as e:
+            raise KeyError(f"No size with key: {e.args[0]} existed in {size}")
 
     def set_window_position(self, x: float, y: float, windowHandle: str = "current") -> dict:
         """Sets the x,y position of the current window. (window.moveTo)
@@ -1075,7 +1078,10 @@ def get_window_position(self, windowHandle="current") -> dict:
         self._check_if_window_handle_is_current(windowHandle)
         position = self.get_window_rect()
 
-        return {k: position[k] for k in ("x", "y")}
+        try:
+            return {k: position[k] for k in ("x", "y")}
+        except KeyError as e:
+            raise KeyError(f"No position with key: {e.args[0]} existed in {position}")
 
     def _check_if_window_handle_is_current(self, windowHandle: str) -> None:
         """Warns if the window handle is not equal to `current`."""

py/test/selenium/webdriver/common/window_tests.py

@@ -14,6 +14,9 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+import re
+from random import randint
+from unittest.mock import Mock
 
 import pytest
 
@@ -45,6 +48,16 @@ def test_should_get_the_size_of_the_current_window(driver):
     assert size.get("height") > 0
 
 
+@pytest.mark.parametrize("missing_key", ["width", "height"])
+def test_get_the_size_of_the_current_window_raises(driver, missing_key):
+    driver.get_window_rect = Mock(return_value={k: randint(1, 15360) for k in ("width", "height") if k != missing_key})
+
+    with pytest.raises(
+        KeyError, match=re.escape(f"No size with key: {missing_key} existed in {driver.get_window_rect.return_value}")
+    ):
+        driver.get_window_size()
+
+
 def test_should_set_the_size_of_the_current_window(driver):
     size = driver.get_window_size()
 
@@ -64,6 +77,17 @@ def test_should_get_the_position_of_the_current_window(driver):
     assert position.get("y") >= 0
 
 
+@pytest.mark.parametrize("missing_key", ["x", "y"])
+def test_get_the_position_of_the_current_window_raises(driver, missing_key):
+    driver.get_window_rect = Mock(return_value={k: randint(0, 15360) for k in ("x", "y") if k != missing_key})
+
+    with pytest.raises(
+        KeyError,
+        match=re.escape(f"No position with key: {missing_key} existed in {driver.get_window_rect.return_value}"),
+    ):
+        driver.get_window_position()
+
+
 def test_should_set_the_position_of_the_current_window(driver):
     position = driver.get_window_position()