nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: functional: Allow parallel installation of apps

Browse Source 
- By waiting for one app to finish installing before trying to install.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2020-05-28 16:57:08 -07:00 committed by James Valleroy
parent 176dc69fc5
commit 28b5ad9191
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plinth/tests/functional/__init__.py
View File

@ -272,22 +272,14 @@ def app_select_domain_name(browser, app_name, domain_name):
######################### #########################
# App install utilities # # App install utilities #
######################### #########################
def _find_install_button(browser, app_name):
nav_to_module(browser, app_name)
return browser.find_by_css('.form-install input[type=submit]')
def is_installed(browser, app_name): def is_installed(browser, app_name):
install_button = _find_install_button(browser, app_name) nav_to_module(browser, app_name)
return not bool(install_button) return not bool(browser.find_by_css('.form-install input[type=submit]'))
def install(browser, app_name): def install(browser, app_name):
install_button = _find_install_button(browser, app_name) nav_to_module(browser, app_name)
if not install_button: install_button_css = '.form-install input[type=submit]'
return
install_button.click()
while True: while True:
script = 'return (document.readyState == "complete") && ' \ script = 'return (document.readyState == "complete") && ' \
'(!Boolean(document.querySelector(".installing")));' '(!Boolean(document.querySelector(".installing")));'
@ -295,6 +287,18 @@ def install(browser, app_name):
time.sleep(0.1) time.sleep(0.1)
elif browser.is_element_present_by_css('.neterror'): elif browser.is_element_present_by_css('.neterror'):
browser.visit(browser.url) browser.visit(browser.url)
elif browser.is_element_present_by_css(install_button_css):
install_button = browser.find_by_css(install_button_css).first
if install_button['disabled']:
if not browser.find_by_name('refresh-packages'):
# Package manager is busy, wait and refresh page
time.sleep(1)
browser.visit(browser.url)
else:
# This app is not available in this distribution
raise Exception('App not available in distribution')
else:
install_button.click()
else: else:
break break