From 94c066dc53f347af09bdc5058521f0ca0de21abe Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alexandre.aubin@cern.ch>
Date: Tue, 24 Mar 2020 04:47:21 +0100
Subject: [PATCH] Factorize stuff in cleaning function to avoid repeating so
 much stuff

---
 src/yunohost/tests/test_apps.py | 62 ++++++++-------------------------
 1 file changed, 14 insertions(+), 48 deletions(-)

diff --git a/src/yunohost/tests/test_apps.py b/src/yunohost/tests/test_apps.py
index fdfcc9176..6bc625a91 100644
--- a/src/yunohost/tests/test_apps.py
+++ b/src/yunohost/tests/test_apps.py
@@ -30,65 +30,31 @@ def clean():
     os.system("mkdir -p /etc/ssowat/")
     app_ssowatconf()
 
-    # Gotta first remove break yo system
-    # because some remaining stuff might
-    # make the other app_remove crashs ;P
-    if _is_installed("break_yo_system"):
-        app_remove("break_yo_system")
+    test_apps = ["break_yo_system", "legacy_app", "legacy_app__2", "full_domain_app"]
 
-    if _is_installed("legacy_app"):
-        app_remove("legacy_app")
+    for test_app in test_apps:
 
-    if _is_installed("full_domain_app"):
-        app_remove("full_domain_app")
+        if _is_installed(test_app):
+            app_remove(test_app)
 
-    to_remove = []
-    to_remove += glob.glob("/etc/nginx/conf.d/*.d/*legacy*")
-    to_remove += glob.glob("/etc/nginx/conf.d/*.d/*full_domain*")
-    to_remove += glob.glob("/etc/nginx/conf.d/*.d/*break_yo_system*")
-    for filepath in to_remove:
-        os.remove(filepath)
+        for filepath in glob.glob("/etc/nginx/conf.d/*.d/*%s*" % test_app):
+            os.remove(filepath)
+        for folderpath in glob.glob("/etc/yunohost/apps/*%s*" % test_app):
+            shutil.rmtree(folderpath, ignore_errors=True)
+        for folderpath in glob.glob("/var/www/*%s*" % test_app):
+            shutil.rmtree(folderpath, ignore_errors=True)
 
-    to_remove = []
-    to_remove += glob.glob("/etc/yunohost/apps/*legacy_app*")
-    to_remove += glob.glob("/etc/yunohost/apps/*full_domain_app*")
-    to_remove += glob.glob("/etc/yunohost/apps/*break_yo_system*")
-    to_remove += glob.glob("/var/www/*legacy*")
-    to_remove += glob.glob("/var/www/*full_domain*")
-    for folderpath in to_remove:
-        shutil.rmtree(folderpath, ignore_errors=True)
+        os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP DATABASE %s' \"" % test_app)
+        os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP USER %s@localhost'\"" % test_app)
 
     os.system("systemctl reset-failed nginx")  # Reset failed quota for service to avoid running into start-limit rate ?
     os.system("systemctl start nginx")
 
-    # Clean permission
+    # Clean permissions
     for permission_name in user_permission_list(short=True)["permissions"]:
-        if "legacy_app" in permission_name or \
-           "full_domain_app" in permission_name or \
-           "break_yo_system" in permission_name:
+        if any(test_app in permission_name for test_app in test_apps):
             permission_delete(permission_name, force=True)
 
-    # Clean database
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP DATABASE legacy_app' \"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP USER legacy_app@localhost'\"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP DATABASE legacy_app__2'\"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP USER legacy_app__2@localhost'\"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP DATABASE legacy_app__3'\"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP USER legacy_app__3@localhost'\"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP DATABASE full_domain'\"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP USER full_domain@localhost'\"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP DATABASE full_domain__2'\"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP USER full_domain__2@localhost'\"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP DATABASE full_domain__3'\"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP USER full_domain__3@localhost'\"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP DATABASE break_yo_system'\"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP USER break_yo_system@localhost'\"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP DATABASE break_yo_system__2'\"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP USER break_yo_system__2@localhost'\"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP DATABASE break_yo_system__3'\"")
-    os.system("bash -c \"mysql -u root --password=$(cat /etc/yunohost/mysql) 2>/dev/null <<< 'DROP USER break_yo_system__3@localhost'\"")
-
-
 @pytest.fixture(autouse=True)
 def check_LDAP_db_integrity_call():
     check_LDAP_db_integrity()