From 0a2ba102c883c0a5b96cf451ab8a7a0c6fedb0dd Mon Sep 17 00:00:00 2001
From: ljf <ljf+github@grimaud.me>
Date: Wed, 14 Aug 2019 17:37:43 +0200
Subject: [PATCH] [enh] Avoid to modify untestable migrations

---
 .../0004_php5_to_php7_pools.py                | 77 +++++++++----------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/src/yunohost/data_migrations/0004_php5_to_php7_pools.py b/src/yunohost/data_migrations/0004_php5_to_php7_pools.py
index 7bb9123ec..3bc6bacc4 100644
--- a/src/yunohost/data_migrations/0004_php5_to_php7_pools.py
+++ b/src/yunohost/data_migrations/0004_php5_to_php7_pools.py
@@ -25,54 +25,54 @@ class MyMigration(Migration):
     dependencies = ["migrate_to_stretch"]
 
     def run(self):
-        try:
-            # Get list of php5 pool files
-            php5_pool_files = glob.glob("{}/*.conf".format(PHP5_POOLS))
+        # Get list of php5 pool files
+        php5_pool_files = glob.glob("{}/*.conf".format(PHP5_POOLS))
 
-            # Keep only basenames
-            php5_pool_files = [os.path.basename(f) for f in php5_pool_files]
+        # Keep only basenames
+        php5_pool_files = [os.path.basename(f) for f in php5_pool_files]
 
-            # Ignore the "www.conf" (default stuff, probably don't want to touch it ?)
-            php5_pool_files = [f for f in php5_pool_files if f != "www.conf"]
+        # Ignore the "www.conf" (default stuff, probably don't want to touch it ?)
+        php5_pool_files = [f for f in php5_pool_files if f != "www.conf"]
 
-            for f in php5_pool_files:
+        for f in php5_pool_files:
 
-                # Copy the files to the php7 pool
-                src = "{}/{}".format(PHP5_POOLS, f)
-                dest = "{}/{}".format(PHP7_POOLS, f)
-                copy2(src, dest)
+            # Copy the files to the php7 pool
+            src = "{}/{}".format(PHP5_POOLS, f)
+            dest = "{}/{}".format(PHP7_POOLS, f)
+            copy2(src, dest)
 
-                # Replace the socket prefix if it's found
-                c = "sed -i -e 's@{}@{}@g' {}".format(PHP5_SOCKETS_PREFIX, PHP7_SOCKETS_PREFIX, dest)
-                os.system(c)
+            # Replace the socket prefix if it's found
+            c = "sed -i -e 's@{}@{}@g' {}".format(PHP5_SOCKETS_PREFIX, PHP7_SOCKETS_PREFIX, dest)
+            os.system(c)
 
-                # Also add a comment that it was automatically moved from php5
-                # (for human traceability and backward migration)
-                c = "sed -i '1i {}' {}".format(MIGRATION_COMMENT, dest)
-                os.system(c)
+            # Also add a comment that it was automatically moved from php5
+            # (for human traceability and backward migration)
+            c = "sed -i '1i {}' {}".format(MIGRATION_COMMENT, dest)
+            os.system(c)
 
-                # Some old comments starting with '#' instead of ';' are not
-                # compatible in php7
-                c = "sed -i 's/^#/;#/g' {}".format(dest)
-                os.system(c)
+            # Some old comments starting with '#' instead of ';' are not
+            # compatible in php7
+            c = "sed -i 's/^#/;#/g' {}".format(dest)
+            os.system(c)
 
-            # Reload/restart the php pools
-            _run_service_command("restart", "php7.0-fpm")
-            _run_service_command("enable", "php7.0-fpm")
-            os.system("systemctl stop php5-fpm")
-            os.system("systemctl disable php5-fpm")
-            os.system("rm /etc/logrotate.d/php5-fpm")  # We remove this otherwise the logrotate cron will be unhappy
+        # Reload/restart the php pools
+        _run_service_command("restart", "php7.0-fpm")
+        _run_service_command("enable", "php7.0-fpm")
+        os.system("systemctl stop php5-fpm")
+        os.system("systemctl disable php5-fpm")
+        os.system("rm /etc/logrotate.d/php5-fpm")  # We remove this otherwise the logrotate cron will be unhappy
 
-            # Get list of nginx conf file
-            nginx_conf_files = glob.glob("/etc/nginx/conf.d/*.d/*.conf")
-            for f in nginx_conf_files:
-                # Replace the socket prefix if it's found
-                c = "sed -i -e 's@{}@{}@g' {}".format(PHP5_SOCKETS_PREFIX, PHP7_SOCKETS_PREFIX, f)
-                os.system(c)
+        # Get list of nginx conf file
+        nginx_conf_files = glob.glob("/etc/nginx/conf.d/*.d/*.conf")
+        for f in nginx_conf_files:
+            # Replace the socket prefix if it's found
+            c = "sed -i -e 's@{}@{}@g' {}".format(PHP5_SOCKETS_PREFIX, PHP7_SOCKETS_PREFIX, f)
+            os.system(c)
 
-            # Reload nginx
-            _run_service_command("reload", "nginx")
-        except Exception:
+        # Reload nginx
+        _run_service_command("reload", "nginx")
+
+        def backward(self):
 
             # Get list of php7 pool files
             php7_pool_files = glob.glob("{}/*.conf".format(PHP7_POOLS))
@@ -97,4 +97,3 @@ class MyMigration(Migration):
 
             # Reload nginx
             _run_service_command("reload", "nginx")
-            raise