From cdb66d27285d0017c27ed4fe2a12e5457652338f Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Sat, 11 May 2019 22:43:16 +0200
Subject: [PATCH 01/14] Restart tests if there's a temporary error

---
 sub_scripts/log_extractor.sh   | 27 +++++++++++
 sub_scripts/testing_process.sh | 85 +++++++++++++++++++++++++++-------
 2 files changed, 95 insertions(+), 17 deletions(-)

diff --git a/sub_scripts/log_extractor.sh b/sub_scripts/log_extractor.sh
index c395b01..b5ad4b7 100755
--- a/sub_scripts/log_extractor.sh
+++ b/sub_scripts/log_extractor.sh
@@ -57,6 +57,32 @@ COPY_LOG () {
 	fi
 }
 
+FALSE_ERRORS_DETECTION () {
+    # Detect false positive errors.
+    false_positive_error=0
+
+    # Detect network error
+    if grep --quiet "Network is unreachable" "$temp_result"
+    then
+        false_positive_error=1
+        false_positive_error_cond="network"
+    fi
+
+    # Detect DNS error
+    if grep --quiet "Temporary failure resolving" "$temp_result"
+    then
+        false_positive_error=1
+        false_positive_error_cond="DNS failure"
+    fi
+
+    # Detect Corrupt source
+    if grep --quiet "Corrupt source" "$temp_result"
+    then
+        false_positive_error=1
+        false_positive_error_cond="corrupt source"
+    fi
+}
+
 PARSE_LOG () {
 	# Print all errors and warning found in the log.
 
@@ -125,4 +151,5 @@ LOG_EXTRACTOR () {
 
 	CLEAR_LOG	# Remove all knew useless warning lines.
 	PARSE_LOG	# Print all errors and warning found in the log.
+	FALSE_ERRORS_DETECTION	# Detect if there's a temporary error that shouldn't impact the test.
 }
diff --git a/sub_scripts/testing_process.sh b/sub_scripts/testing_process.sh
index 80dda1f..31d43a6 100644
--- a/sub_scripts/testing_process.sh
+++ b/sub_scripts/testing_process.sh
@@ -21,6 +21,19 @@ break_before_continue () {
 	fi
 }
 
+check_false_positive_error () {
+    # Check if FALSE_ERRORS_DETECTION has detected an false positive error.
+
+    # We will use
+    # check_false_positive_error || return $?
+    # to check the result of the function of propagate the result to parent functions.
+
+    if [ $false_positive_error -eq 1 ] && [ $false_positive_error_loop -lt $max_false_positive_error_loop ]; then
+        # Return 75, for EX_TEMPFAIL from sysexits.h
+        return 75
+    fi
+}
+
 #=================================================
 
 PRINT_YUNOHOST_VERSION () {
@@ -96,6 +109,7 @@ SETUP_APP () {
 
 	# Analyse the log to extract "warning" and "error" lines
 	LOG_EXTRACTOR
+	check_false_positive_error || return $?
 }
 
 STANDARD_SETUP_APP () {
@@ -109,6 +123,7 @@ STANDARD_SETUP_APP () {
 		then
 			# Make an installation
 			SETUP_APP
+            check_false_positive_error || return $?
 		else
 			# Or uses an existing snapshot
 			ECHO_FORMAT "Uses an existing snapshot for root installation.\n" "white" clog
@@ -122,6 +137,7 @@ STANDARD_SETUP_APP () {
 		then
 			# Make an installation
 			SETUP_APP
+            check_false_positive_error || return $?
 		else
 			# Or uses an existing snapshot
 			ECHO_FORMAT "Uses an existing snapshot for sub path installation.\n" "white" clog
@@ -534,6 +550,7 @@ CHECK_SETUP () {
 
 	# Install the application in a LXC container
 	SETUP_APP
+	check_false_positive_error || return $?
 
 	# Try to access the app by its url
 	CHECK_URL
@@ -580,6 +597,7 @@ CHECK_SETUP () {
 
 	# Analyse the log to extract "warning" and "error" lines
 	LOG_EXTRACTOR
+	check_false_positive_error || return $?
 
 	# Check the result and print SUCCESS or FAIL
 	if check_test_result_remove
@@ -601,6 +619,7 @@ CHECK_SETUP () {
 		ECHO_FORMAT "\nReinstall the application after a removing.\n" "white" "bold" clog
 		
 		SETUP_APP
+        check_false_positive_error || return $?
 
 		# Try to access the app by its url
 		CHECK_URL
@@ -677,6 +696,7 @@ CHECK_UPGRADE () {
 		then
 			# If no commit is specified, use the current version.
 			STANDARD_SETUP_APP
+            check_false_positive_error || return $?
 		else
 			# Otherwise, use a specific commit
 			# Backup the modified arguments
@@ -698,6 +718,7 @@ CHECK_UPGRADE () {
 			(cd "$package_path"; git checkout --force --quiet "$commit")
 			# Install the application
 			SETUP_APP
+            check_false_positive_error || return $?
 			# Then replace the backup
 			sudo rm -r "$package_path"
 			sudo mv "${package_path}_back" "$package_path"
@@ -730,6 +751,7 @@ CHECK_UPGRADE () {
 
 			# Analyse the log to extract "warning" and "error" lines
 			LOG_EXTRACTOR
+			check_false_positive_error || return $?
 
 			# Try to access the app by its url
 			CHECK_URL
@@ -831,6 +853,7 @@ CHECK_PUBLIC_PRIVATE () {
 
 		# Install the application in a LXC container
 		SETUP_APP
+        check_false_positive_error || return $?
 
 		# Try to access the app by its url
 		CHECK_URL
@@ -926,6 +949,7 @@ CHECK_MULTI_INSTANCE () {
 
 		# Install the application in a LXC container
 		SETUP_APP
+        check_false_positive_error || return $?
 
 		# Store the result in the correct variable
 		# First installation
@@ -1065,6 +1089,7 @@ CHECK_COMMON_ERROR () {
 
 	# Install the application in a LXC container
 	SETUP_APP
+	check_false_positive_error || return $?
 
 	# Try to access the app by its url
 	CHECK_URL
@@ -1147,6 +1172,7 @@ CHECK_BACKUP_RESTORE () {
 
 		# Install the application in a LXC container
 		STANDARD_SETUP_APP
+        check_false_positive_error || return $?
 
 		# Remove the previous residual backups
 		sudo rm -rf /var/lib/lxc/$lxc_name/rootfs/home/yunohost.backup/archives
@@ -1178,6 +1204,7 @@ CHECK_BACKUP_RESTORE () {
 
 			# Analyse the log to extract "warning" and "error" lines
 			LOG_EXTRACTOR
+			check_false_positive_error || return $?
 		fi
 
 		# Check the result and print SUCCESS or FAIL
@@ -1245,6 +1272,7 @@ CHECK_BACKUP_RESTORE () {
 
 			# Analyse the log to extract "warning" and "error" lines
 			LOG_EXTRACTOR
+			check_false_positive_error || return $?
 
 			# Try to access the app by its url
 			CHECK_URL
@@ -1357,6 +1385,7 @@ CHECK_CHANGE_URL () {
 		# Install the application in a LXC container
 		ECHO_FORMAT "\nPreliminary install...\n" "white" "bold" clog
 		STANDARD_SETUP_APP
+        check_false_positive_error || return $?
 
 		# Check if the install had work
 		if [ $yunohost_result -ne 0 ]
@@ -1383,6 +1412,7 @@ CHECK_CHANGE_URL () {
 
 			# Analyse the log to extract "warning" and "error" lines
 			LOG_EXTRACTOR
+			check_false_positive_error || return $?
 
 			# Try to access the app by its url
 			check_path=$new_path
@@ -1442,29 +1472,50 @@ TEST_LAUNCHER () {
 	# Intialize values
 	yunohost_result=-1
 	yunohost_remove=-1
+    false_positive_error=0
+    max_false_positive_error_loop=3
 
-	# Start the timer for this test
-	start_timer
-	# And keep this value separately
-	local global_start_timer=$starttime
+    for false_positive_error_loop in $( seq 1 $max_false_positive_error_loop )
+    do
+        # Start the timer for this test
+        start_timer
+        # And keep this value separately
+        local global_start_timer=$starttime
 
-	# Execute the test
-	$1 $2
+        # Execute the test
+        $1 $2
 
-	# Uses the default snapshot
-	current_snapshot=snap0
+        if [ $false_positive_error -eq 1 ]
+        then
+            ECHO_FORMAT "This test was aborted because of a $false_positive_error_cond error.\n" "red" "bold" clog
+            if [ $false_positive_error_loop -lt $max_false_positive_error_loop ]
+            then
+                ECHO_FORMAT "The test will restart.\n" "lyellow" "bold" clog
+                cur_test=$((cur_test-1))
+            fi
+        fi
 
-	# Stop and restore the LXC container
-	LXC_STOP
+        # Uses the default snapshot
+        current_snapshot=snap0
 
-	# Restore the started time for the timer
-	starttime=$global_start_timer
-	# End the timer for the test
-	stop_timer 2
+        # Stop and restore the LXC container
+        LXC_STOP
 
-	# Update the lock file with the date of the last finished test.
-	# $$ is the PID of package_check itself.
-	echo "$1 $2:$(date +%s):$$" > "$lock_file"
+        # Restore the started time for the timer
+        starttime=$global_start_timer
+        # End the timer for the test
+        stop_timer 2
+
+        # Update the lock file with the date of the last finished test.
+        # $$ is the PID of package_check itself.
+        echo "$1 $2:$(date +%s):$$" > "$lock_file"
+
+        # Exit the loop if there's no temporary errors detected.
+        if [ $false_positive_error -eq 0 ]
+        then
+            break
+        fi
+    done
 }
 
 set_witness_files () {

From 593a85e3b9dee6ce300dc59be0ab1b076a89783f Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Tue, 21 May 2019 13:40:58 +0200
Subject: [PATCH 02/14] Always reinstall and create snapshot if no install done

---
 sub_scripts/testing_process.sh | 54 ++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/sub_scripts/testing_process.sh b/sub_scripts/testing_process.sh
index 31d43a6..5fafd26 100644
--- a/sub_scripts/testing_process.sh
+++ b/sub_scripts/testing_process.sh
@@ -124,6 +124,18 @@ STANDARD_SETUP_APP () {
 			# Make an installation
 			SETUP_APP
             check_false_positive_error || return $?
+
+            # Create a snapshot for this installation, to be able to reuse it instead of a new installation.
+            # But only if this installation has worked fine
+            if [ $yunohost_result -eq 0 ]; then
+                # Check if a snapshot already exist for a root install
+                if [ -z "$root_snapshot" ]
+                then
+                    ECHO_FORMAT "\nCreate a snapshot for root installation.\n" "white" clog
+                    create_temp_backup 2
+                    root_snapshot=snap2
+                fi
+            fi
 		else
 			# Or uses an existing snapshot
 			ECHO_FORMAT "Uses an existing snapshot for root installation.\n" "white" clog
@@ -138,6 +150,18 @@ STANDARD_SETUP_APP () {
 			# Make an installation
 			SETUP_APP
             check_false_positive_error || return $?
+
+            # Create a snapshot for this installation, to be able to reuse it instead of a new installation.
+            # But only if this installation has worked fine
+            if [ $yunohost_result -eq 0 ]; then
+                # Check if a snapshot already exist for a subpath (or no_url) install
+                if [ -z "$subpath_snapshot" ]
+                then
+                    ECHO_FORMAT "\nCreate a snapshot for sub path installation.\n" "white" clog
+                    create_temp_backup 1
+                    root_snapshot=snap1
+                fi
+            fi
 		else
 			# Or uses an existing snapshot
 			ECHO_FORMAT "Uses an existing snapshot for sub path installation.\n" "white" clog
@@ -502,8 +526,12 @@ is_install_failed () {
 	then
 		# If root installation worked, return root or force_install_ok setted, return root.
 		echo root
+    elif [ $RESULT_check_sub_dir -ne -1 ] && [ $RESULT_check_root -ne 1 ]
+    then
+		# If no installation has been done, return root
+		echo root
 	else
-		ECHO_FORMAT "All installs failed, impossible to perform this test...\n" "red" clog
+		ECHO_FORMAT "All installs failed, impossible to perform this test...\n" "red" clog >&2
 		return 1
 	fi
 }
@@ -568,30 +596,6 @@ CHECK_SETUP () {
 		local check_result_setup=-1	# Installation failed
 	fi
 
-	# Create a snapshot for this installation, to be able to reuse it instead of a new installation.
-	# But only if this installation has worked fine
-	if [ $check_result_setup -eq 1 ]; then
-		if [ "$check_path" = "/" ]
-		then
-			# Check if a snapshot already exist for a root install
-			if [ -z "$root_snapshot" ]
-			then
-				ECHO_FORMAT "Create a snapshot for root installation.\n" "white" clog
-				create_temp_backup 2
-				root_snapshot=snap2
-			fi
-		else
-			# Check if a snapshot already exist for a subpath (or no_url) install
-			if [ -z "$subpath_snapshot" ]
-			then
-				# Then create a snapshot
-				ECHO_FORMAT "Create a snapshot for sub path installation.\n" "white" clog
-				create_temp_backup 1
-				subpath_snapshot=snap1
-			fi
-		fi
-	fi
-
 	# Remove the application
 	REMOVE_APP
 

From 85bee3d9b715fe6e4a8858a6d17eb17ab14819b8 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Wed, 22 May 2019 00:27:17 +0200
Subject: [PATCH 03/14] Fix and improvement around installations

---
 package_check.sh               |   5 +-
 sub_scripts/testing_process.sh | 151 +++++++++++++++++++--------------
 2 files changed, 93 insertions(+), 63 deletions(-)

diff --git a/package_check.sh b/package_check.sh
index 78ebb6d..cb28972 100755
--- a/package_check.sh
+++ b/package_check.sh
@@ -1070,8 +1070,11 @@ then
 			if [ "${value:0:1}" = "1" ]
 			then
 				echo 1
-			else
+			elif [ "${value:0:1}" = "0" ]
+			then
 				echo 0
+            else
+                echo -1
 			fi
 		}
 
diff --git a/sub_scripts/testing_process.sh b/sub_scripts/testing_process.sh
index 5fafd26..6c36e33 100644
--- a/sub_scripts/testing_process.sh
+++ b/sub_scripts/testing_process.sh
@@ -518,20 +518,35 @@ check_test_result_remove () {
 is_install_failed () {
 	# Check if an install have previously work
 
-	if [ $RESULT_check_sub_dir -eq 1 ]
-	then
-		# If subdir installation worked.
-		echo subdir
-	elif [ $RESULT_check_root -eq 1 ] || [ $force_install_ok -eq 1 ]
-	then
-		# If root installation worked, return root or force_install_ok setted, return root.
-		echo root
-    elif [ $RESULT_check_sub_dir -ne -1 ] && [ $RESULT_check_root -ne 1 ]
+    # If the test for install in sub dir isn't desactivated
+    if [ $setup_sub_dir -ne 0 ]
     then
-		# If no installation has been done, return root
-		echo root
-	else
-		ECHO_FORMAT "All installs failed, impossible to perform this test...\n" "red" clog >&2
+        # If a test succeed or if force_install_ok is set
+        if [ $RESULT_check_sub_dir -eq 1 ] || [ $force_install_ok -eq 1 ]
+        then
+            # Validate installation in sub dir.
+            sub_dir_install=1
+        fi
+    else
+        sub_dir_install=0
+    fi
+
+    # If the test for install on root isn't desactivated
+    if [ $setup_root -ne 0 ]
+    then
+        # If a test succeed or if force_install_ok is set
+        if [ $RESULT_check_root -eq 1 ] || [ $force_install_ok -eq 1 ]
+        then
+            # Validate installation on root.
+            root_install=1
+        fi
+    else
+        root_install=0
+    fi
+
+    if [ $sub_dir_install -eq 0 ] && [ $root_install -eq 0 ]
+    then
+		ECHO_FORMAT "All installs have failed, impossible to perform this test...\n" "red" clog
 		return 1
 	fi
 }
@@ -596,6 +611,30 @@ CHECK_SETUP () {
 		local check_result_setup=-1	# Installation failed
 	fi
 
+	# Create a snapshot for this installation, to be able to reuse it instead of a new installation.
+	# But only if this installation has worked fine
+	if [ $check_result_setup -eq 1 ]; then
+		if [ "$check_path" = "/" ]
+		then
+			# Check if a snapshot already exist for a root install
+			if [ -z "$root_snapshot" ]
+			then
+				ECHO_FORMAT "Create a snapshot for root installation.\n" "white" clog
+				create_temp_backup 2
+				root_snapshot=snap2
+			fi
+		else
+			# Check if a snapshot already exist for a subpath (or no_url) install
+			if [ -z "$subpath_snapshot" ]
+			then
+				# Then create a snapshot
+				ECHO_FORMAT "Create a snapshot for sub path installation.\n" "white" clog
+				create_temp_backup 1
+				subpath_snapshot=snap1
+			fi
+		fi
+	fi
+
 	# Remove the application
 	REMOVE_APP
 
@@ -674,9 +713,8 @@ CHECK_UPGRADE () {
 		fi
 
 		# Check if an install have previously work
-		local previous_install=$(is_install_failed)
 		# Abort if none install worked
-		[ "$previous_install" = "1" ] && return
+		is_install_failed || return
 
 		# Copy original arguments
 		local manifest_args_mod="$manifest_arguments"
@@ -685,9 +723,9 @@ CHECK_UPGRADE () {
 		check_domain=$sub_domain
 		replace_manifest_key "domain" "$check_domain"
 		# Use a path according to previous succeeded installs
-		if [ "$previous_install" = "subdir" ]; then
+		if [ $sub_dir_install -eq 1 ]; then
 			local check_path=$test_path
-		elif [ "$previous_install" = "root" ]; then
+        else
 			local check_path=/
 		fi
 		replace_manifest_key "path" "$check_path"
@@ -799,9 +837,7 @@ CHECK_PUBLIC_PRIVATE () {
 	check_manifest_key "public_private" || return
 
 	# Check if an install have previously work
-	local previous_install=$(is_install_failed)
-	# Abort if none install worked
-	[ "$previous_install" = "1" ] && return
+	is_install_failed || return
 
 	# Copy original arguments
 	local manifest_args_mod="$manifest_arguments"
@@ -827,8 +863,8 @@ CHECK_PUBLIC_PRIVATE () {
 		# First, try with a root install
 		if [ $i -eq 0 ]
 		then
-			# Check if root installation worked, or if force_install_ok is setted.
-			if [ $RESULT_check_root -eq 1 ] || [ $force_install_ok -eq 1 ]
+			# Check if root installation worked
+			if [ $root_install -eq 1 ]
 			then
 				# Replace manifest key for path
 				local check_path=/
@@ -843,7 +879,7 @@ CHECK_PUBLIC_PRIVATE () {
 		elif [ $i -eq 1 ]
 		then
 			# Check if sub path installation worked, or if force_install_ok is setted.
-			if [ $RESULT_check_sub_dir -eq 1 ] || [ $force_install_ok -eq 1 ]
+			if [ $sub_dir_install -eq 1 ]
 			then
 				# Replace manifest key for path
 				local check_path=$test_path
@@ -914,17 +950,15 @@ CHECK_MULTI_INSTANCE () {
 	unit_test_title "Multi-instance installations..."
 
 	# Check if an install have previously work
-	local previous_install=$(is_install_failed)
-	# Abort if none install worked
-	[ "$previous_install" = "1" ] && return
+	is_install_failed || return
 
 	# Copy original arguments
 	local manifest_args_mod="$manifest_arguments"
 
 	# Replace manifest key for the test
-	if [ "$previous_install" = "subdir" ]; then
+	if [ $sub_dir_install -eq 1 ]; then
 		local check_path=$test_path
-	elif [ "$previous_install" = "root" ]; then
+	else
 		local check_path=/
 	fi
 	replace_manifest_key "path" "$check_path"
@@ -1034,9 +1068,7 @@ CHECK_COMMON_ERROR () {
 	fi
 
 	# Check if an install have previously work
-	local previous_install=$(is_install_failed)
-	# Abort if none install worked
-	[ "$previous_install" = "1" ] && return
+	is_install_failed || return
 
 	# Copy original arguments
 	local manifest_args_mod="$manifest_arguments"
@@ -1056,7 +1088,7 @@ CHECK_COMMON_ERROR () {
 		local check_path=$test_path
 	else [ "$install_type" = "port_already_use" ]
 		# Use a path according to previous succeeded installs
-		if [ "$previous_install" = "subdir" ]; then
+		if [ $sub_dir_install -eq 1 ]; then
 			local check_path=$test_path
 		else
 			local check_path=/
@@ -1124,9 +1156,7 @@ CHECK_BACKUP_RESTORE () {
 	unit_test_title "Backup/Restore..."
 
 	# Check if an install have previously work
-	local previous_install=$(is_install_failed)
-	# Abort if none install worked
-	[ "$previous_install" = "1" ] && return
+	is_install_failed || return
 
 	# Copy original arguments
 	local manifest_args_mod="$manifest_arguments"
@@ -1145,7 +1175,7 @@ CHECK_BACKUP_RESTORE () {
 		if [ $i -eq 0 ]
 		then
 			# Check if root installation worked, or if force_install_ok is setted.
-			if [ $RESULT_check_root -eq 1 ] || [ $force_install_ok -eq 1 ]
+			if [ $root_install -eq 1 ]
 			then
 				# Replace manifest key for path
 				local check_path=/
@@ -1161,7 +1191,7 @@ CHECK_BACKUP_RESTORE () {
 		elif [ $i -eq 1 ]
 		then
 			# Check if sub path installation worked, or if force_install_ok is setted.
-			if [ $RESULT_check_sub_dir -eq 1 ] || [ $force_install_ok -eq 1 ]
+			if [ $sub_dir_install -eq 1 ]
 			then
 				# Replace manifest key for path
 				local check_path=$test_path
@@ -1310,9 +1340,7 @@ CHECK_CHANGE_URL () {
 	check_manifest_key "domain" || return
 
 	# Check if an install have previously work
-	local previous_install=$(is_install_failed)
-	# Abort if none install worked
-	[ "$previous_install" = "1" ] && return
+	is_install_failed || return
 
 	# Copy original arguments
 	local manifest_args_mod="$manifest_arguments"
@@ -1327,7 +1355,7 @@ CHECK_CHANGE_URL () {
 	# Without modify the domain, root to path, path to path and path to root.
 	# And then, same with a domain change
 	local i=0
-	for i in ` seq 1 6`
+	for i in `seq 1 6`
 	do
 		if [ $i -eq 1 ]; then
 			# Same domain, root to path
@@ -1364,27 +1392,24 @@ CHECK_CHANGE_URL () {
 		replace_manifest_key "path" "$check_path"
 
 		# Check if root or subpath installation worked, or if force_install_ok is setted.
-		if [ $force_install_ok -eq 1 ]
-		then
-			# Try with a sub path install
-			if [ "$check_path" = "/" ]
-			then
-				if [ $RESULT_check_root -ne 1 ] && [ $force_install_ok -ne 1 ]
-				then
-					# Jump this test
-					ECHO_FORMAT "Root install failed, impossible to perform this test...\n" "lyellow" clog
-					continue
-				fi
-			# And with a sub path install
-			else
-				if [ $RESULT_check_sub_dir -ne 1 ] && [ $force_install_ok -ne 1 ]
-				then
-					# Jump this test
-					ECHO_FORMAT "Sub path install failed, impossible to perform this test...\n" "lyellow" clog
-					continue
-				fi
-			fi
-		fi
+        # Try with a sub path install
+        if [ "$check_path" = "/" ]
+        then
+            if [ $root_install -eq 0 ]
+            then
+                # Jump this test
+                ECHO_FORMAT "Root install failed, impossible to perform this test...\n" "lyellow" clog
+                continue
+            fi
+        # And with a sub path install
+        else
+            if [ $sub_dir_install -eq 0 ]
+            then
+                # Jump this test
+                ECHO_FORMAT "Sub path install failed, impossible to perform this test...\n" "lyellow" clog
+                continue
+            fi
+        fi
 
 		# Install the application in a LXC container
 		ECHO_FORMAT "\nPreliminary install...\n" "white" "bold" clog
@@ -1438,6 +1463,8 @@ CHECK_CHANGE_URL () {
 		# Make a break if auto_remove is set
 		break_before_continue
 
+		# Uses the default snapshot
+		current_snapshot=snap0
 		# Stop and restore the LXC container
 		LXC_STOP
 	done

From de56cf144d67304cf48c4a07b02e83a4d1a2e429 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Wed, 22 May 2019 00:37:33 +0200
Subject: [PATCH 04/14] Do not show unavailable ressources if not asking for it

---
 package_check.sh               |  11 +++-
 sub_scripts/testing_process.sh | 115 +++++++++++++++++----------------
 2 files changed, 69 insertions(+), 57 deletions(-)

diff --git a/package_check.sh b/package_check.sh
index cb28972..2d52a42 100755
--- a/package_check.sh
+++ b/package_check.sh
@@ -50,6 +50,7 @@ interrupt=0
 notice=0
 build_lxc=0
 bash_mode=0
+show_resources=0
 
 # If no arguments provided
 if [ "$#" -eq 0 ]
@@ -70,6 +71,7 @@ else
 		arguments[$i]=${arguments[$i]//--help/-h}
 		arguments[$i]=${arguments[$i]//--build-lxc/-l}
 		arguments[$i]=${arguments[$i]//--bash-mode/-y}
+		arguments[$i]=${arguments[$i]//--show-resources/-r}
 	done
 
 	# Read and parse all the arguments
@@ -83,7 +85,7 @@ else
 				# Initialize the index of getopts
 				OPTIND=1
 				# Parse with getopts only if the argument begin by -
-				getopts ":b:fihly" parameter || true
+				getopts ":b:fihlyr" parameter || true
 				case $parameter in
 					b)
 						# --branch=branch-name
@@ -115,6 +117,11 @@ else
 						bash_mode=1
 						shift_value=1
 						;;
+					r)
+						# --show-resources
+						show_resources=1
+						shift_value=1
+						;;
 					\?)
 						echo "Invalid argument: -${OPTARG:-}"
 						notice=1
@@ -166,6 +173,8 @@ package_check.sh [OPTION]... PACKAGE_TO_CHECK
 		Install LXC and build the container if necessary.
 	-y, --bash-mode
 		Do not ask for continue check. Ignore auto_remove.
+	-r, --show-resources
+		Show the unavailable resources when accessing the url.
 EOF
 	exit 0
 fi
diff --git a/sub_scripts/testing_process.sh b/sub_scripts/testing_process.sh
index 6c36e33..a692b27 100644
--- a/sub_scripts/testing_process.sh
+++ b/sub_scripts/testing_process.sh
@@ -356,64 +356,67 @@ CHECK_URL () {
 					lynx -dump -force_html "$script_dir/url_output" | head --lines 20 | tee --append "$test_result"
 					echo -e "\e[0m"
 
-					# Get all the resources for the main page of the app.
-					local HTTP_return
-					local moved=0
-					local ignored=0
-					while read HTTP_return
-					do
-						# Ignore robots.txt and ynhpanel.js. They always redirect to the portal.
-						if echo "$HTTP_return" | grep --quiet "$check_domain/robots.txt\|$check_domain/ynhpanel.js"; then
-							ECHO_FORMAT "Ressource ignored:" "white"
-							ECHO_FORMAT " ${HTTP_return##*http*://}\n"
-							ignored=1
-						fi
+					if [ $show_resources -eq 1 ]
+					then
+                        # Get all the resources for the main page of the app.
+                        local HTTP_return
+                        local moved=0
+                        local ignored=0
+                        while read HTTP_return
+                        do
+                            # Ignore robots.txt and ynhpanel.js. They always redirect to the portal.
+                            if echo "$HTTP_return" | grep --quiet "$check_domain/robots.txt\|$check_domain/ynhpanel.js"; then
+                                ECHO_FORMAT "Ressource ignored:" "white"
+                                ECHO_FORMAT " ${HTTP_return##*http*://}\n"
+                                ignored=1
+                            fi
 
-						# If it's the line with the resource to get
-						if echo "$HTTP_return" | grep --quiet "^--.*--  http"
-						then
-							# Get only the resource itself.
-							local resource=${HTTP_return##*http*://}
+                            # If it's the line with the resource to get
+                            if echo "$HTTP_return" | grep --quiet "^--.*--  http"
+                            then
+                                # Get only the resource itself.
+                                local resource=${HTTP_return##*http*://}
 
-						# Else, if would be the HTTP return code.
-						else
-							# If the return code is different than 200.
-							if ! echo "$HTTP_return" | grep --quiet "200 OK$"
-							then
-								# Skipped the check of ignored ressources.
-								if [ $ignored -eq 1 ]
-								then
-									ignored=0
-									continue
-								fi
-								# Isolate the http return code.
-								http_code="${HTTP_return##*awaiting response... }"
-								http_code="${http_code:0:3}"
-								# If the return code is 301 or 302, let's check the redirection.
-								if echo "$HTTP_return" | grep --quiet "30[12] Moved"
-								then
-									ECHO_FORMAT "Ressource moved:" "white"
-									ECHO_FORMAT " $resource\n"
-									moved=1
-								else
-									ECHO_FORMAT "Resource unreachable (Code $http_code)" "red" "bold"
-									ECHO_FORMAT " $resource\n"
-# 					 				curl_error=1
-									moved=0
-								fi
-							else
-								if [ $moved -eq 1 ]
-								then
-									if echo "$resource" | grep --quiet "/yunohost/sso/"
-									then
-										ECHO_FORMAT "The previous resource is redirected to the YunoHost portal\n" "red"
-#	 					 				curl_error=1
-									fi
-								fi
-								moved=0
-							fi
-						fi
-					done <<< "$(cd "$package_path"; LC_ALL=C wget --adjust-extension --page-requisites --no-check-certificate $check_domain$curl_check_path 2>&1 | grep "^--.*--  http\|^HTTP request sent")"
+                            # Else, if would be the HTTP return code.
+                            else
+                                # If the return code is different than 200.
+                                if ! echo "$HTTP_return" | grep --quiet "200 OK$"
+                                then
+                                    # Skipped the check of ignored ressources.
+                                    if [ $ignored -eq 1 ]
+                                    then
+                                        ignored=0
+                                        continue
+                                    fi
+                                    # Isolate the http return code.
+                                    http_code="${HTTP_return##*awaiting response... }"
+                                    http_code="${http_code:0:3}"
+                                    # If the return code is 301 or 302, let's check the redirection.
+                                    if echo "$HTTP_return" | grep --quiet "30[12] Moved"
+                                    then
+                                        ECHO_FORMAT "Ressource moved:" "white"
+                                        ECHO_FORMAT " $resource\n"
+                                        moved=1
+                                    else
+                                        ECHO_FORMAT "Resource unreachable (Code $http_code)" "red" "bold"
+                                        ECHO_FORMAT " $resource\n"
+#    					 				curl_error=1
+                                        moved=0
+                                    fi
+                                else
+                                    if [ $moved -eq 1 ]
+                                    then
+                                        if echo "$resource" | grep --quiet "/yunohost/sso/"
+                                        then
+                                            ECHO_FORMAT "The previous resource is redirected to the YunoHost portal\n" "red"
+#   	 					 				curl_error=1
+                                        fi
+                                    fi
+                                    moved=0
+                                fi
+                            fi
+                        done <<< "$(cd "$package_path"; LC_ALL=C wget --adjust-extension --page-requisites --no-check-certificate $check_domain$curl_check_path 2>&1 | grep "^--.*--  http\|^HTTP request sent")"
+                    fi
 					echo ""
 				fi
 			fi

From 372c0a14c0c3048146698193e33ce71a197228c3 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Mon, 27 May 2019 13:16:02 +0200
Subject: [PATCH 05/14] Fix no_url install

---
 sub_scripts/testing_process.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sub_scripts/testing_process.sh b/sub_scripts/testing_process.sh
index a692b27..9d4c99b 100644
--- a/sub_scripts/testing_process.sh
+++ b/sub_scripts/testing_process.sh
@@ -535,7 +535,7 @@ is_install_failed () {
     fi
 
     # If the test for install on root isn't desactivated
-    if [ $setup_root -ne 0 ]
+    if [ $setup_root -ne 0 ] || [ $setup_nourl -eq 1 ]
     then
         # If a test succeed or if force_install_ok is set
         if [ $RESULT_check_root -eq 1 ] || [ $force_install_ok -eq 1 ]

From abcdef95d5c2451de1388ae6b3ea6252412cd75d Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Tue, 28 May 2019 01:23:19 +0200
Subject: [PATCH 06/14] Fix tests without install

---
 sub_scripts/testing_process.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sub_scripts/testing_process.sh b/sub_scripts/testing_process.sh
index 9d4c99b..5da5c66 100644
--- a/sub_scripts/testing_process.sh
+++ b/sub_scripts/testing_process.sh
@@ -525,7 +525,8 @@ is_install_failed () {
     if [ $setup_sub_dir -ne 0 ]
     then
         # If a test succeed or if force_install_ok is set
-        if [ $RESULT_check_sub_dir -eq 1 ] || [ $force_install_ok -eq 1 ]
+        # Or if $setup_sub_dir isn't set in the check_process
+        if [ $RESULT_check_sub_dir -eq 1 ] || [ $force_install_ok -eq 1 ] || [ $setup_sub_dir -eq -1 ]
         then
             # Validate installation in sub dir.
             sub_dir_install=1
@@ -535,10 +536,12 @@ is_install_failed () {
     fi
 
     # If the test for install on root isn't desactivated
+
     if [ $setup_root -ne 0 ] || [ $setup_nourl -eq 1 ]
     then
         # If a test succeed or if force_install_ok is set
-        if [ $RESULT_check_root -eq 1 ] || [ $force_install_ok -eq 1 ]
+        # Or if $setup_root isn't set in the check_process
+        if [ $RESULT_check_root -eq 1 ] || [ $force_install_ok -eq 1 ] || [ $setup_root -eq -1 ]
         then
             # Validate installation on root.
             root_install=1

From b1fba7ec2104b6e3dbe02b34be806c1b512d0ee8 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Tue, 28 May 2019 01:23:39 +0200
Subject: [PATCH 07/14] Fix multiple upgrade_from

---
 package_check.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package_check.sh b/package_check.sh
index 2d52a42..5a0f7e9 100755
--- a/package_check.sh
+++ b/package_check.sh
@@ -1146,8 +1146,11 @@ then
 			then
 				# Add the commit to the upgrade list
 				line="${line##*from_commit=}"
-				echo "$line" >> "$script_dir/upgrade_list"
-			else
+                # Add the upgrade to the list only if the test is set to 1
+                if [ $temp_upgrade -eq 1 ]; then
+                    echo "$line" >> "$script_dir/upgrade_list"
+                fi
+			elif [ $temp_upgrade -eq 1 ]; then
 				# Or simply 'current' for a standard upgrade.
 				echo "current" >> "$script_dir/upgrade_list"
 			fi

From e281682db4754b8b7ed107f498219fe137933d98 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Tue, 28 May 2019 20:36:19 +0200
Subject: [PATCH 08/14] Add another dns failure

---
 sub_scripts/log_extractor.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sub_scripts/log_extractor.sh b/sub_scripts/log_extractor.sh
index b5ad4b7..6e900ef 100755
--- a/sub_scripts/log_extractor.sh
+++ b/sub_scripts/log_extractor.sh
@@ -74,6 +74,11 @@ FALSE_ERRORS_DETECTION () {
         false_positive_error=1
         false_positive_error_cond="DNS failure"
     fi
+    if grep --quiet "unable to resolve host address" "$temp_result"
+    then
+        false_positive_error=1
+        false_positive_error_cond="DNS failure"
+    fi
 
     # Detect Corrupt source
     if grep --quiet "Corrupt source" "$temp_result"

From 106d29b5ba03e29a4fa6330112abf931a5cb0439 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sat, 1 Jun 2019 19:26:50 +0200
Subject: [PATCH 09/14] adding labriqueinternet as autorized repository

---
 package_check.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/package_check.sh b/package_check.sh
index 78ebb6d..b7c404c 100755
--- a/package_check.sh
+++ b/package_check.sh
@@ -663,16 +663,22 @@ TEST_RESULTS () {
 		# Check the YEP 1.7 (https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-17---ajouter-lapp-%C3%A0-lorganisation-yunohost-apps---valid%C3%A9--manuel--official-)
 		# Default value, YEP 1.7 not checked
 		YEP17=-1
+		YEP17_labriqueinternet=-1
 		if echo "$app_arg" | grep --extended-regexp --quiet "https?:\/\/"
 		then
 			# If the app have been picked from github, check if this app was under the YunoHost-Apps organisation
 			# YEP17 will be equal to 1 if the app was under the YunoHost-Apps organisation
 			YEP17=$(echo "$app_arg" | grep --ignore-case --count "github.com/YunoHost-Apps/")
-			[ $YEP17 -eq 1 ] || ECHO_FORMAT "This app doesn't respect the YEP 1.7 ! (https://yunohost.org/#/packaging_apps_guidelines_fr)\n" "red"
+			# If the app have been picked from github, check if this app was under the labriqueinternet organisation
+			# YEP17_labriqueinternet will be equal to 1 if the app was under the labriqueinternet organisation
+			YEP17_labriqueinternet=$(echo "$app_arg" | grep --ignore-case --count "github.com/labriqueinternet/")
+			if ( [ $YEP17 -eq 1 ] && [ $YEP17_labriqueinternet -eq 1 ] )
+			then ECHO_FORMAT "This app doesn't respect the YEP 1.7 ! (https://yunohost.org/#/packaging_apps_guidelines_fr)\n" "red"
+		    fi
 		fi
 
 		# Validated if YEP 1.7 respected
-		if 	[ $YEP17 -ne 0 ]
+		if ( [ $YEP17 -ne 0 ] || [ $YEP17_labriqueinternet -ne 0 ] )
 		then level[6]=2
 		else level[6]=0
 		fi

From 8f1239e4f618733ce1d407be075bc29185477ac2 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Sat, 1 Jun 2019 19:34:11 +0200
Subject: [PATCH 10/14] Fix conditions

---
 package_check.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package_check.sh b/package_check.sh
index b7c404c..6bb640f 100755
--- a/package_check.sh
+++ b/package_check.sh
@@ -672,13 +672,13 @@ TEST_RESULTS () {
 			# If the app have been picked from github, check if this app was under the labriqueinternet organisation
 			# YEP17_labriqueinternet will be equal to 1 if the app was under the labriqueinternet organisation
 			YEP17_labriqueinternet=$(echo "$app_arg" | grep --ignore-case --count "github.com/labriqueinternet/")
-			if ( [ $YEP17 -eq 1 ] && [ $YEP17_labriqueinternet -eq 1 ] )
-			then ECHO_FORMAT "This app doesn't respect the YEP 1.7 ! (https://yunohost.org/#/packaging_apps_guidelines_fr)\n" "red"
-		    fi
+			if [ $YEP17 -ne 1 ] && [ $YEP17_labriqueinternet -ne 1 ]; then
+				ECHO_FORMAT "This app doesn't respect the YEP 1.7 ! (https://yunohost.org/#/packaging_apps_guidelines_fr)\n" "red"
+			fi
 		fi
 
 		# Validated if YEP 1.7 respected
-		if ( [ $YEP17 -ne 0 ] || [ $YEP17_labriqueinternet -ne 0 ] )
+		if [ $YEP17 -ne 0 ] && [ $YEP17_labriqueinternet -ne 0 ]
 		then level[6]=2
 		else level[6]=0
 		fi

From 5e401923d59a46c5050116c373c0bc96287821ab Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Thu, 20 Jun 2019 01:37:42 +0200
Subject: [PATCH 11/14] Remove swap before creating snapshots

---
 sub_scripts/launcher.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sub_scripts/launcher.sh b/sub_scripts/launcher.sh
index eebcca1..bb2741a 100755
--- a/sub_scripts/launcher.sh
+++ b/sub_scripts/launcher.sh
@@ -75,6 +75,14 @@ create_temp_backup () {
 	# Stop the container, before its snapshot
 	sudo lxc-stop --name $lxc_name >&2
 
+	# Remove swap files to avoid killing the CI with huge snapshots.
+	local swap_file="/var/lib/lxc/$lxc_name/rootfs/swap_$ynh_app_id"
+	if [ -e "$swap_file" ]
+	then
+        sudo swapoff "$swap_file"
+        sudo rm "$swap_file"
+	fi
+
 	# Check if the snapshot already exist
 	if [ ! -e "$snapshot_path/snap$snap_number" ]
 	then

From 45a074c48f9e5e0f062b93b4e9c56a783b667d0c Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Thu, 20 Jun 2019 11:46:13 +0200
Subject: [PATCH 12/14] Update sub_scripts/testing_process.sh

Co-Authored-By: Kayou <pierre.moltess@gmail.com>
---
 sub_scripts/testing_process.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sub_scripts/testing_process.sh b/sub_scripts/testing_process.sh
index 5da5c66..9392cdd 100644
--- a/sub_scripts/testing_process.sh
+++ b/sub_scripts/testing_process.sh
@@ -522,6 +522,7 @@ is_install_failed () {
 	# Check if an install have previously work
 
     # If the test for install in sub dir isn't desactivated
+    sub_dir_install=0
     if [ $setup_sub_dir -ne 0 ]
     then
         # If a test succeed or if force_install_ok is set

From a60a9dba9db7f15b86979d78ed213b905c56cdc4 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Thu, 20 Jun 2019 11:46:24 +0200
Subject: [PATCH 13/14] Update sub_scripts/testing_process.sh

Co-Authored-By: Kayou <pierre.moltess@gmail.com>
---
 sub_scripts/testing_process.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sub_scripts/testing_process.sh b/sub_scripts/testing_process.sh
index 9392cdd..1f40a9f 100644
--- a/sub_scripts/testing_process.sh
+++ b/sub_scripts/testing_process.sh
@@ -538,6 +538,7 @@ is_install_failed () {
 
     # If the test for install on root isn't desactivated
 
+    root_install=0
     if [ $setup_root -ne 0 ] || [ $setup_nourl -eq 1 ]
     then
         # If a test succeed or if force_install_ok is set

From 7da1c39137e2c3e6e46e62af47397963daf6b352 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Thu, 20 Jun 2019 12:35:32 +0200
Subject: [PATCH 14/14] Fix removing swap

---
 sub_scripts/launcher.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sub_scripts/launcher.sh b/sub_scripts/launcher.sh
index bb2741a..44b902c 100755
--- a/sub_scripts/launcher.sh
+++ b/sub_scripts/launcher.sh
@@ -77,7 +77,7 @@ create_temp_backup () {
 
 	# Remove swap files to avoid killing the CI with huge snapshots.
 	local swap_file="/var/lib/lxc/$lxc_name/rootfs/swap_$ynh_app_id"
-	if [ -e "$swap_file" ]
+	if sudo test -e "$swap_file"
 	then
         sudo swapoff "$swap_file"
         sudo rm "$swap_file"