From fe02b9f1e3c53b1483b7e5452f2509684b7a422a Mon Sep 17 00:00:00 2001 From: Joseph Nuthalpati Date: Fri, 16 Aug 2019 22:53:25 +0530 Subject: [PATCH] functional_tests: Fix site.is_available not handling default paths Sites might have default paths like /mediawiki/Main_Page or /transmission/web. The tests are doing an exact match on the path which is causing test failures. Modified the support function site.is_available to handle default paths. Signed-off-by: Joseph Nuthalapati Reviewed-by: Sunil Mohan Adapa --- functional_tests/support/site.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/functional_tests/support/site.py b/functional_tests/support/site.py index 82355d077..bfd831f96 100644 --- a/functional_tests/support/site.py +++ b/functional_tests/support/site.py @@ -51,8 +51,9 @@ def is_available(browser, site_name): time.sleep(3) browser.reload() not_404 = '404' not in browser.title - # A trailing slash might be appended by Apache redirect rules - no_redirect = url_to_visit.strip('/') == browser.url.strip('/') + # The site might have a default path after the sitename, + # e.g /mediawiki/Main_Page + no_redirect = browser.url.startswith(url_to_visit.strip('/')) return not_404 and no_redirect