YunoHost/package_check
1
0
Fork 0
mirror of https://github.com/YunoHost/package_check.git synced 2024-09-03 20:06:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Moar refactoring

Browse source
This commit is contained in:
Alexandre Aubin 2023-01-27 22:47:53 +01:00
parent 6197e36e21
commit a65f16dd08
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/lxc.sh
View file

@ -97,7 +97,7 @@ LXC_EXEC () {
start_timer start_timer
# Execute the command given in argument in the container and log its results. # Execute the command given in argument in the container and log its results.
lxc exec $LXC_NAME --env PACKAGE_CHECK_EXEC=1 -t -- /bin/bash -c "$cmd" | tee -a "$complete_log" $current_test_log lxc exec $LXC_NAME --env PACKAGE_CHECK_EXEC=1 -t -- /bin/bash -c "$cmd" | tee -a "$full_log" $current_test_log
# Store the return code of the command # Store the return code of the command
local returncode=${PIPESTATUS[0]} local returncode=${PIPESTATUS[0]}

6
lib/tests.sh
View file

@ -277,7 +277,7 @@ _VALIDATE_THAT_APP_CAN_BE_ACCESSED () {
then then
# Print the title of the page # Print the title of the page
local page_title=$(grep "<title>" "$curl_output" | cut --delimiter='>' --fields=2 | cut --delimiter='<' --fields=1) local page_title=$(grep "<title>" "$curl_output" | cut --delimiter='>' --fields=2 | cut --delimiter='<' --fields=1)
local page_extract=$(lynx -dump -force_html "$curl_output" | head --lines 20 | tee -a "$complete_log") local page_extract=$(lynx -dump -force_html "$curl_output" | head --lines 20 | tee -a "$full_log")
# Check if the page title is neither the YunoHost portail or default NGINX page # Check if the page title is neither the YunoHost portail or default NGINX page
if [ "$page_title" = "YunoHost Portal" ] if [ "$page_title" = "YunoHost Portal" ]
@ -355,8 +355,8 @@ TEST_PACKAGE_LINTER () {
start_test "Package linter" start_test "Package linter"
# Execute package linter and linter_result gets the return code of the package linter # Execute package linter and linter_result gets the return code of the package linter
./package_linter/package_linter.py "$package_path" | tee -a "$complete_log" ./package_linter/package_linter.py "$package_path" | tee -a "$full_log"
./package_linter/package_linter.py "$package_path" --json | tee -a "$complete_log" > $current_test_results ./package_linter/package_linter.py "$package_path" --json | tee -a "$full_log" > $current_test_results
return ${PIPESTATUS[0]} return ${PIPESTATUS[0]}
} }

16
lib/tests_coordination.sh
View file

@ -5,13 +5,17 @@ source lib/tests.sh
source lib/witness.sh source lib/witness.sh
source lib/legacy.sh source lib/legacy.sh
readonly complete_log="./Complete-${WORKER_ID}.log" readonly full_log="./full_log_${WORKER_ID}.log"
readonly result_json="./results_${WORKER_ID}.json"
readonly summary_png="./summary_${WORKER_ID}.png"
# Purge some log files # Purge some log files
rm -f "$complete_log" && touch "$complete_log" rm -f "$full_log" && touch "$full_log"
rm $result_json
rm $summary_png
# Redirect fd 3 (=debug steam) to complete log # Redirect fd 3 (=debug steam) to full log
exec 3>>$complete_log exec 3>>$full_log
#================================================= #=================================================
# Misc test helpers & coordination # Misc test helpers & coordination
@ -84,8 +88,8 @@ run_all_tests() {
# Print the final results of the tests # Print the final results of the tests
log_title "Tests summary" log_title "Tests summary"
python3 lib/analyze_test_results.py $TEST_CONTEXT 2> ./results-${WORKER_ID}.json python3 lib/analyze_test_results.py $TEST_CONTEXT 2> $result_json
[[ -e "$TEST_CONTEXT/summary.png" ]] && cp "$TEST_CONTEXT/summary.png" ./summary.png || rm -f summary.png [[ -e "$TEST_CONTEXT/summary.png" ]] && cp "$TEST_CONTEXT/summary.png" $summary_png || rm -f $summary_png
# Restore the started time for the timer # Restore the started time for the timer
starttime=$complete_start_timer starttime=$complete_start_timer