nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

upgrades: Cleanup use of return value from _apt_run

Browse Source 
_apt_run does not return anything.

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
[sunil: Update test case]
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Tested-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
James Valleroy 2025-04-07 21:02:52 -04:00 committed by Sunil Mohan Adapa
parent 97cc901fe6
commit e4586eeb72
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plinth/modules/upgrades/distupgrade.py
View File

@ -338,11 +338,7 @@ def _apt_autoremove():
def _apt_full_upgrade(): def _apt_full_upgrade():
"""Run and check if apt upgrade was successful.""" """Run and check if apt upgrade was successful."""
logger.info('Running apt full-upgrade...') logger.info('Running apt full-upgrade...')
returncode = _apt_run(['full-upgrade']) _apt_run(['full-upgrade'])
if returncode:
raise RuntimeError(
'Apt full-upgrade was not successful. Distribution upgrade '
'will be retried at a later time.')
def _unattended_upgrades_run(): def _unattended_upgrades_run():

4
plinth/modules/upgrades/tests/test_distupgrade.py
View File

@ -396,10 +396,6 @@ def test_apt_full_upgrade(apt_run):
distupgrade._apt_full_upgrade() distupgrade._apt_full_upgrade()
apt_run.assert_called_with(['full-upgrade']) apt_run.assert_called_with(['full-upgrade'])
apt_run.return_value = 1
with pytest.raises(RuntimeError):
distupgrade._apt_full_upgrade()
@patch('subprocess.run') @patch('subprocess.run')
def test_unatteneded_upgrades_run(run): def test_unatteneded_upgrades_run(run):