From df67b3fe39f53f95f00e16666347ee47a7d5fa75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Mon, 18 Mar 2024 18:42:40 +0100
Subject: [PATCH 1/2] No stderr redirects

---
 scripts/install | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/install b/scripts/install
index c17edcc..6ef380a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -78,25 +78,25 @@ chown -R "$app:www-data" "$install_dir"
 _ynh_exec_with_drush_php drush "@$app" site-install framaforms_org \
     install_configure_form.site_contact_url="https://forum.yunohost.org/t/framaforms-create-polls-using-drag-and-drop/8208" \
     install_configure_form.site_default_country=FR \
-    -y --locale="$language" --account-name="admin" --account-pass="$password" --site-name="Framaforms" --site-mail="$admin_mail" 2>&1
+    -y --locale="$language" --account-name="admin" --account-pass="$password" --site-name="Framaforms" --site-mail="$admin_mail"
 _ynh_exec_with_drush_php drush "@$app" variable-set update_notify_emails "$admin_mail"
-_ynh_exec_with_drush_php drush "@$app" variable-set file_private_path "/home/yunohost.app/$app/data" 2>&1
-_ynh_exec_with_drush_php drush "@$app" pm-enable framaforms_feature -y --resolve-dependencies 2>&1
-_ynh_exec_with_drush_php drush "@$app" php-eval "module_load_include('inc', 'framaforms', 'includes/framaforms.pages');create_all_pages();" 2>&1 || true
+_ynh_exec_with_drush_php drush "@$app" variable-set file_private_path "/home/yunohost.app/$app/data"
+_ynh_exec_with_drush_php drush "@$app" pm-enable framaforms_feature -y --resolve-dependencies
+_ynh_exec_with_drush_php drush "@$app" php-eval "module_load_include('inc', 'framaforms', 'includes/framaforms.pages');create_all_pages();" || true
 
 #=================================================
 # IMPORTING LANGUAGE PACK
 #=================================================
 ynh_script_progression --message="Importing language pack..." --weight=5
 
-_ynh_exec_with_drush_php drush "@$app" pm-download -y drush_language 2>&1
-_ynh_exec_with_drush_php drush "@$app" pm-download -y l10n_update 2>&1
-_ynh_exec_with_drush_php drush "@$app" pm-enable -y l10n_update 2>&1
-_ynh_exec_with_drush_php drush "@$app" language-add "$language" -y 2>&1
-_ynh_exec_with_drush_php drush "@$app" language-default "$language" -y 2>&1
-_ynh_exec_with_drush_php drush "@$app" cache-clear drush -y 2>&1
-_ynh_exec_with_drush_php drush "@$app" l10n-update-refresh -y 2>&1
-_ynh_exec_with_drush_php drush "@$app" l10n-update -y 2>&1
+_ynh_exec_with_drush_php drush "@$app" pm-download -y drush_language
+_ynh_exec_with_drush_php drush "@$app" pm-download -y l10n_update
+_ynh_exec_with_drush_php drush "@$app" pm-enable -y l10n_update
+_ynh_exec_with_drush_php drush "@$app" language-add "$language" -y
+_ynh_exec_with_drush_php drush "@$app" language-default "$language" -y
+_ynh_exec_with_drush_php drush "@$app" cache-clear drush -y
+_ynh_exec_with_drush_php drush "@$app" l10n-update-refresh -y
+_ynh_exec_with_drush_php drush "@$app" l10n-update -y
 
 # We don't upgrade module to avoid to erase framaforms change
 # in drupal core and modules code

From 979780b1440269e797985696772cabeb45a0ad8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Mon, 18 Mar 2024 23:37:17 +0100
Subject: [PATCH 2/2] fix test_upgrade_from: add missing arguments

---
 tests.toml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests.toml b/tests.toml
index b4e3e57..82aab28 100644
--- a/tests.toml
+++ b/tests.toml
@@ -8,5 +8,9 @@ test_format = 1.0
     # Tests to run
     # ------------
 
-    test_upgrade_from.cb1ccdf04ff50b14826a96da2930570bd482f233.name = "1.0.3~ynh3"
-    test_upgrade_from.cb1ccdf04ff50b14826a96da2930570bd482f233.args.path = "/"
+    [default.test_upgrade_from.cb1ccdf04ff50b14826a96da2930570bd482f233]
+    name = "1.0.3~ynh3"
+    args.path = "/"
+    args.domain = "domain.tld"
+    args.admin = "package_checker"
+    args.password = "MySuperComplexPassword"