YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

ci: fix backup test / gotta tell the mocker about the new 'name' arg for backup create messages é_è

Browse source
This commit is contained in:
Alexandre Aubin 2023-02-06 16:15:55 +01:00
parent 0f24846e0b
commit 29c6564f09
1 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/tests/test_backuprestore.py
View file

@ -6,6 +6,8 @@ from mock import patch
from .conftest import message, raiseYunohostError, get_test_apps_dir from .conftest import message, raiseYunohostError, get_test_apps_dir
from moulinette.utils.text import random_ascii
from yunohost.app import app_install, app_remove, app_ssowatconf from yunohost.app import app_install, app_remove, app_ssowatconf
from yunohost.app import _is_installed from yunohost.app import _is_installed
from yunohost.backup import ( from yunohost.backup import (
@ -236,8 +238,9 @@ def add_archive_system_from_4p2():
def test_backup_only_ldap(mocker): def test_backup_only_ldap(mocker):
# Create the backup # Create the backup
with message(mocker, "backup_created"): name = random_ascii(8)
backup_create(system=["conf_ldap"], apps=None) with message(mocker, "backup_created", name=name):
backup_create(name=name, system=["conf_ldap"], apps=None)
archives = backup_list()["archives"] archives = backup_list()["archives"]
assert len(archives) == 1 assert len(archives) == 1
@ -261,9 +264,10 @@ def test_backup_system_part_that_does_not_exists(mocker):
def test_backup_and_restore_all_sys(mocker): def test_backup_and_restore_all_sys(mocker):
name = random_ascii(8)
# Create the backup # Create the backup
with message(mocker, "backup_created"): with message(mocker, "backup_created", name=name):
backup_create(system=[], apps=None) backup_create(name=name, system=[], apps=None)
archives = backup_list()["archives"] archives = backup_list()["archives"]
assert len(archives) == 1 assert len(archives) == 1
@ -294,9 +298,10 @@ def test_backup_and_restore_all_sys(mocker):
@pytest.mark.with_system_archive_from_4p2 @pytest.mark.with_system_archive_from_4p2
def test_restore_system_from_Ynh4p2(monkeypatch, mocker): def test_restore_system_from_Ynh4p2(monkeypatch, mocker):
name = random_ascii(8)
# Backup current system # Backup current system
with message(mocker, "backup_created"): with message(mocker, "backup_created", name=name):
backup_create(system=[], apps=None) backup_create(name=name, system=[], apps=None)
archives = backup_list()["archives"] archives = backup_list()["archives"]
assert len(archives) == 2 assert len(archives) == 2
@ -393,16 +398,17 @@ def test_backup_app_with_no_restore_script(mocker):
@pytest.mark.clean_opt_dir @pytest.mark.clean_opt_dir
def test_backup_with_different_output_directory(mocker): def test_backup_with_different_output_directory(mocker):
name = random_ascii(8)
# Create the backup # Create the backup
with message(mocker, "backup_created"): with message(mocker, "backup_created", name=name):
backup_create( backup_create(
system=["conf_ynh_settings"], system=["conf_ynh_settings"],
apps=None, apps=None,
output_directory="/opt/test_backup_output_directory", output_directory="/opt/test_backup_output_directory",
name="backup", name=name,
) )
assert os.path.exists("/opt/test_backup_output_directory/backup.tar") assert os.path.exists(f"/opt/test_backup_output_directory/{name}.tar")
archives = backup_list()["archives"] archives = backup_list()["archives"]
assert len(archives) == 1 assert len(archives) == 1
@ -416,13 +422,14 @@ def test_backup_with_different_output_directory(mocker):
@pytest.mark.clean_opt_dir @pytest.mark.clean_opt_dir
def test_backup_using_copy_method(mocker): def test_backup_using_copy_method(mocker):
# Create the backup # Create the backup
with message(mocker, "backup_created"): name = random_ascii(8)
with message(mocker, "backup_created", name=name):
backup_create( backup_create(
system=["conf_ynh_settings"], system=["conf_ynh_settings"],
apps=None, apps=None,
output_directory="/opt/test_backup_output_directory", output_directory="/opt/test_backup_output_directory",
methods=["copy"], methods=["copy"],
name="backup", name=name,
) )
assert os.path.exists("/opt/test_backup_output_directory/info.json") assert os.path.exists("/opt/test_backup_output_directory/info.json")
@ -565,8 +572,9 @@ def test_backup_and_restore_permission_app(mocker):
def _test_backup_and_restore_app(mocker, app): def _test_backup_and_restore_app(mocker, app):
# Create a backup of this app # Create a backup of this app
with message(mocker, "backup_created"): name = random_ascii(8)
backup_create(system=None, apps=[app]) with message(mocker, "backup_created", name=name):
backup_create(name=name, system=None, apps=[app])
archives = backup_list()["archives"] archives = backup_list()["archives"]
assert len(archives) == 1 assert len(archives) == 1
@ -628,8 +636,9 @@ def test_restore_archive_with_custom_hook(mocker):
os.system("touch %s/99-yolo" % custom_restore_hook_folder) os.system("touch %s/99-yolo" % custom_restore_hook_folder)
# Backup with custom hook system # Backup with custom hook system
with message(mocker, "backup_created"): name = random_ascii(8)
backup_create(system=[], apps=None) with message(mocker, "backup_created", name=name):
backup_create(name=name, system=[], apps=None)
archives = backup_list()["archives"] archives = backup_list()["archives"]
assert len(archives) == 1 assert len(archives) == 1
@ -666,5 +675,6 @@ def test_backup_binds_are_readonly(mocker, monkeypatch):
) )
# Create the backup # Create the backup
with message(mocker, "backup_created"): name = random_ascii(8)
backup_create(system=[]) with message(mocker, "backup_created", name=name):
backup_create(name=name, system=[])