Functional tests: fix waiting for redirects

wait_for_page_update has an 'expected_url' argument that you can use
to make the browser wait until it reaches an expected URL after a
redirect.

Reviewed-by: James Valleroy <jvalleroy@mailbox.org>

functional_tests/support/service.py

@@ -62,19 +62,32 @@ def eventually(function, args=[], timeout=30):
 
 
 @contextmanager
-def wait_for_page_update(browser, timeout=300):
+def wait_for_page_update(browser, timeout=300, expected_url=None):
-    current_page = browser.find_by_tag('body').first
+    page_body = browser.find_by_tag('body').first
     yield
-    WebDriverWait(browser, timeout).until(is_stale(current_page))
+    WebDriverWait(browser, timeout).until(page_loaded(page_body, expected_url))
 
 
-class is_stale():
+class page_loaded():
-    def __init__(self, element):
+    """
+    Wait until a page (re)loaded.
+
+    - element: Wait until this element gets stale
+    - expected_url (optional): Wait for the URL to become <expected_url>.
+      This can be necessary to wait for a redirect to finish.
+    """
+    def __init__(self, element, expected_url=None):
         self.element = element
+        self.expected_url = expected_url
 
     def __call__(self, driver):
+        is_stale = False
         try:
             self.element.has_class('whatever_class')
-            return False
         except StaleElementReferenceException:
-            return True
+            if self.expected_url is None:
+                is_stale = True
+            else:
+                if driver.url.endswith(self.expected_url):
+                    is_stale = True
+        return is_stale

functional_tests/support/system.py

@@ -210,7 +210,8 @@ def backup_restore(browser, app_name):
     browser.find_link_by_href(
         '/plinth/sys/backups/restore-archive/_functional_test_' +
         app_name + '/').first.click()
-    submit(browser)
+    with wait_for_page_update(browser, expected_url='/plinth/sys/backups/'):
+        submit(browser)
 
 
 def backup_upload_and_restore(browser, app_name, downloaded_file_path):
@@ -222,7 +223,7 @@ def backup_upload_and_restore(browser, app_name, downloaded_file_path):
     # submit upload form
     submit(browser)
     # submit restore form
-    with wait_for_page_update(browser):
+    with wait_for_page_update(browser, expected_url='/plinth/sys/backups/'):
         submit(browser)