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: Use background fixture for each test

Browse Source 
Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
James Valleroy 2021-11-03 06:43:41 -04:00 committed by Sunil Mohan Adapa
parent 84ab4b3b3c
commit 3043574eb0
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plinth/modules/matrixsynapse/tests/test_functional.py
View File

@ -17,18 +17,15 @@ class TestMatrixSynapseApp(functional.BaseAppTests):
has_web = False has_web = False
@pytest.fixture(scope='class', autouse=True) @pytest.fixture(scope='class', autouse=True)
def fixture_background(self, session_browser): def fixture_setup(self, session_browser):
"""Login and install the app.""" """Setup the app."""
functional.login(session_browser) functional.login(session_browser)
functional.set_domain_name(session_browser, 'mydomain.example') functional.set_domain_name(session_browser, 'mydomain.example')
functional.install(session_browser, self.app_name) functional.install(session_browser, self.app_name)
functional.app_select_domain_name(session_browser, self.app_name, functional.app_select_domain_name(session_browser, self.app_name,
'mydomain.example') 'mydomain.example')
yield
functional.app_disable(session_browser, self.app_name)
def test_run_diagnostics(self, session_browser): def test_run_diagnostics(self, session_browser):
"""Add a short delay before checking diagnostics.""" """Add a short delay before checking diagnostics."""
functional.app_enable(session_browser, self.app_name)
time.sleep(1) time.sleep(1)
super().test_run_diagnostics(session_browser) super().test_run_diagnostics(session_browser)

6
plinth/modules/zoph/tests/test_functional.py
View File

@ -15,13 +15,11 @@ class TestZophApp(functional.BaseAppTests):
has_web = True has_web = True
@pytest.fixture(scope='class', autouse=True) @pytest.fixture(scope='class', autouse=True)
def fixture_background(self, session_browser): def fixture_setup(self, session_browser):
"""Login and install the app.""" """Setup the app."""
functional.login(session_browser) functional.login(session_browser)
functional.install(session_browser, self.app_name) functional.install(session_browser, self.app_name)
self._zoph_is_setup(session_browser) self._zoph_is_setup(session_browser)
yield
functional.app_disable(session_browser, self.app_name)
def _zoph_is_setup(self, session_browser): def _zoph_is_setup(self, session_browser):
"""Click setup button on the setup page.""" """Click setup button on the setup page."""

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

@ -616,30 +616,29 @@ class BaseAppTests:
if self.has_web: if self.has_web:
assert not is_available(session_browser, self.app_name) assert not is_available(session_browser, self.app_name)
@pytest.fixture(scope='class', autouse=True) @pytest.fixture(autouse=True)
def fixture_background(self, session_browser): def fixture_background(self, session_browser):
"""Login and install the app.""" """Login, install, and enable the app."""
login(session_browser) login(session_browser)
install(session_browser, self.app_name) install(session_browser, self.app_name)
app_enable(session_browser, self.app_name)
yield yield
login(session_browser)
app_disable(session_browser, self.app_name) app_disable(session_browser, self.app_name)
def test_enable_disable(self, session_browser): def test_enable_disable(self, session_browser):
"""Test enabling and disabling the app.""" """Test enabling and disabling the app."""
app_disable(session_browser, self.app_name) app_disable(session_browser, self.app_name)
self.assert_app_not_running(session_browser)
app_enable(session_browser, self.app_name) app_enable(session_browser, self.app_name)
self.assert_app_running(session_browser) self.assert_app_running(session_browser)
app_disable(session_browser, self.app_name)
self.assert_app_not_running(session_browser)
def test_run_diagnostics(self, session_browser): def test_run_diagnostics(self, session_browser):
"""Test that all app diagnostics are passing.""" """Test that all app diagnostics are passing."""
if not self.check_diagnostics: if not self.check_diagnostics:
pytest.skip(f'Skipping diagnostics check for ${self.app_name}.') pytest.skip(f'Skipping diagnostics check for ${self.app_name}.')
app_enable(session_browser, self.app_name)
session_browser.find_by_id('id_extra_actions_button').click() session_browser.find_by_id('id_extra_actions_button').click()
submit(session_browser, form_class='form-diagnostics-button') submit(session_browser, form_class='form-diagnostics-button')
@ -654,7 +653,6 @@ class BaseAppTests:
@pytest.mark.backups @pytest.mark.backups
def test_backup_restore(self, session_browser): def test_backup_restore(self, session_browser):
"""Test that backup and restore operations work on the app.""" """Test that backup and restore operations work on the app."""
app_enable(session_browser, self.app_name)
backup_create(session_browser, self.app_name, 'test_' + self.app_name) backup_create(session_browser, self.app_name, 'test_' + self.app_name)
backup_restore(session_browser, self.app_name, 'test_' + self.app_name) backup_restore(session_browser, self.app_name, 'test_' + self.app_name)
self.assert_app_running(session_browser) self.assert_app_running(session_browser)