Merge branch 'dev' into ci-format-dev

data/helpers.d/php

@@ -287,6 +287,12 @@ ynh_remove_fpm_config () {
         fpm_service="php$YNH_DEFAULT_PHP_VERSION-fpm"
     fi
 
+    ynh_secure_remove --file="$fpm_config_dir/pool.d/$app.conf"
+    if [ -e $fpm_config_dir/conf.d/20-$app.ini ]
+    then
+        ynh_secure_remove --file="$fpm_config_dir/conf.d/20-$app.ini"
+    fi
+
     if [ $dedicated_service -eq 1 ]
     then
         # Remove the dedicated service PHP-FPM service for the app
@@ -299,12 +305,6 @@ ynh_remove_fpm_config () {
         ynh_systemd_action --service_name=$fpm_service --action=reload
     fi
 
-    ynh_secure_remove --file="$fpm_config_dir/pool.d/$app.conf"
-    if [ -e $fpm_config_dir/conf.d/20-$app.ini ]
-    then
-        ynh_secure_remove --file="$fpm_config_dir/conf.d/20-$app.ini"
-    fi
-
     # If the PHP version used is not the default version for YunoHost
     if [ "$phpversion" != "$YNH_DEFAULT_PHP_VERSION" ]
     then

src/yunohost/app.py

@@ -3448,19 +3448,6 @@ def _assert_system_is_sane_for_app(manifest, when):
         if status["status"] != "running"
     ]
 
-    # Stupid tmp fix to try to track why the tests are failing
-    if "php7.3-fpm" in [
-        s for s, status in services_status.items() if status["status"] != "running"
-    ]:
-        logger.info(
-            [
-                status
-                for s, status in services_status.items()
-                if status["status"] != "running"
-            ]
-        )
-        os.system("journalctl -u php7.3-fpm -n 300 --no-hostname --no-pager")
-
     if faulty_services:
         if when == "pre":
             raise YunohostValidationError(

src/yunohost/data_migrations/0020_ssh_sftp_permissions.py

@@ -85,7 +85,3 @@ class MyMigration(Migration):
 
     def run_after_system_restore(self):
         self.run()
-
-    def run_before_app_restore(self, app_id):
-        # Nothing to do during app backup restore for this migration
-        pass