Merge pull request #658 from mozilla/tracy/fix-download-mixed-content

tracy/Swap in new test site

Author: Tracy-Walker

tests/downloads/test_mixed_content_download_via_https.py

@@ -1,6 +1,8 @@
 import re
+from time import sleep
 
 import pytest
+from selenium.common.exceptions import StaleElementReferenceException
 from selenium.webdriver import Firefox
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
@@ -19,7 +21,8 @@ def delete_files_regex_string():
     return r"\bdownload\b"
 
 
-MIXED_CONTENT_DOWNLOAD_URL = "https://b-mcb-download.glitch.me/"
+MIXED_CONTENT_DOWNLOAD_URL = "https://file-examples.com/wp-content/storage/2018/04/file_example_AVI_480_750kB.avi"
+MAX_CHECKS = 30
 
 
 def test_mixed_content_download_via_https(driver: Firefox, delete_files):
@@ -29,14 +32,10 @@ def test_mixed_content_download_via_https(driver: Firefox, delete_files):
 
     web_page = GenericPage(driver, url=MIXED_CONTENT_DOWNLOAD_URL)
 
-    # Wait up to 30 seconds for test website to wake up and load the content
+    # Wait up to 30 seconds for test website to wake up and download the content
     web_page.open()
     with driver.context(driver.CONTEXT_CHROME):
-        WebDriverWait(driver, 30).until(EC.title_contains("Hello!"))
-
-    WebDriverWait(driver, 5).until(
-        EC.presence_of_element_located((By.XPATH, "//button[@onclick='runtestSec()']"))
-    ).click()
+        WebDriverWait(driver, 30).until(EC.title_contains("File Examples"))
 
     with driver.context(driver.CONTEXT_CHROME):
         download_name = WebDriverWait(driver, 10).until(
@@ -49,12 +48,23 @@ def test_mixed_content_download_via_https(driver: Firefox, delete_files):
 
         # Verify that the desired download target element is present directly, no extra steps needed.
         download_value = download_name.get_attribute("value")
-        assert re.match(r"download(\(\d+\))?$", download_value), (
+        assert re.match(r"file_example_AVI_480_750kB(\(\d+\)).avi$", download_value), (
             f"The download name is incorrect: {download_value}"
         )
 
         # Verify that the download progress has reached 100%, which indicates that the download is complete.
-        download_status_value = download_status.get_attribute("value")
-        assert download_status_value == "100", (
-            f"The download status is not '100': {download_status_value}"
-        )
+        i = 1
+        while True:
+            try:
+                download_value = download_status.get_attribute("value")
+                if download_value == "100":
+                    break
+            except StaleElementReferenceException:
+                pass
+
+            if i > MAX_CHECKS:
+                raise TimeoutError(
+                    "Download progress did not reach 100% within reasonable time."
+                )
+            sleep(1)
+            i = +1