Merge branch 'trunk' into refactor

Author: cgoldberg

py/selenium/webdriver/remote/websocket_connection.py

@@ -22,6 +22,8 @@
 
 from websocket import WebSocketApp  # type: ignore
 
+from selenium.common import WebDriverException
+
 logger = logging.getLogger(__name__)
 
 
@@ -65,7 +67,12 @@ def execute(self, command):
         response = self._messages.pop(current_id)
 
         if "error" in response:
-            raise Exception(response["error"])
+            error = response["error"]
+            if "message" in response:
+                error_msg = f"{error}: {response['message']}"
+                raise WebDriverException(error_msg)
+            else:
+                raise WebDriverException(error)
         else:
             result = response["result"]
             return self._deserialize_result(result, command)
@@ -97,7 +104,7 @@ def _serialize_command(self, command):
     def _deserialize_result(self, result, command):
         try:
             _ = command.send(result)
-            raise Exception("The command's generator function did not exit when expected!")
+            raise WebDriverException("The command's generator function did not exit when expected!")
         except StopIteration as exit:
             return exit.value
 

py/test/selenium/webdriver/remote/remote_downloads_tests.py

@@ -35,11 +35,15 @@ def test_get_downloadable_files(driver, pages):
 def test_download_file(driver, pages):
     _browser_downloads(driver, pages)
 
-    file_name = driver.get_downloadable_files()[0]
+    # Get a list of downloadable files and find the txt file
+    downloadable_files = driver.get_downloadable_files()
+    text_file_name = next((file for file in downloadable_files if file.endswith(".txt")), None)
+    assert text_file_name is not None, "Could not find a .txt file in downloadable files"
+
     with tempfile.TemporaryDirectory() as target_directory:
-        driver.download_file(file_name, target_directory)
+        driver.download_file(text_file_name, target_directory)
 
-        target_file = os.path.join(target_directory, file_name)
+        target_file = os.path.join(target_directory, text_file_name)
         with open(target_file, "r") as file:
             assert "Hello, World!" in file.read()