From 06a1f367a722168d68856d11ffdd80351ebe2672 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Fri, 24 Feb 2023 17:39:39 +0100
Subject: [PATCH] metrics_stop messing with $? ...

---
 lib/tests.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/tests.sh b/lib/tests.sh
index 4094f8d..a308eb9 100644
--- a/lib/tests.sh
+++ b/lib/tests.sh
@@ -388,10 +388,10 @@ TEST_INSTALL () {
     _INSTALL_APP "path=$check_path" "is_public=$is_public" "init_main_permission=$init_main_permission" \
         && _VALIDATE_THAT_APP_CAN_BE_ACCESSED "$SUBDOMAIN" "$check_path" "$install_type" \
 
-    metrics_stop
-
     local install=$?
 
+    metrics_stop
+
     [ $install -eq 0 ] || return 1
 
     # Create the snapshot that'll be used by other tests later
@@ -497,10 +497,11 @@ TEST_UPGRADE () {
     # Upgrade the application in a LXC container
     _RUN_YUNOHOST_CMD "app upgrade $app_id --file /app_folder --force" \
         && _VALIDATE_THAT_APP_CAN_BE_ACCESSED "$SUBDOMAIN" "$check_path" "upgrade"
+    ret=$?
 
     metrics_stop
 
-    return $?
+    return $ret
 }
 
 TEST_PORT_ALREADY_USED () {
@@ -619,9 +620,8 @@ TEST_BACKUP_RESTORE () {
             metrics_start
             _RUN_YUNOHOST_CMD "backup restore Backup_test --force --apps $app_id" \
                 && _VALIDATE_THAT_APP_CAN_BE_ACCESSED "$SUBDOMAIN" "$check_path"
-            metrics_stop
-
             ret=$?
+            metrics_stop
             [ $ret -eq 0 ] || main_result=1
 
             break_before_continue