From dacb3b0fac69265be900abb955b61813d67db239 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Sat, 11 Jan 2025 18:05:32 +0100 Subject: [PATCH] chore(cleanup): log compression test does not belong It is a feature and best tested in Forgejo itself, not in end-to-end. It is a recurring source of false negative and there is little to no value is fixing the associated border case because it only applies to short lived Forgejo instances used during tests. Fixes: https://code.forgejo.org/forgejo/end-to-end/issues/431 --- actions/actions.sh | 9 +-------- actions/feature-logs-compression/run.sh | 15 --------------- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100755 actions/feature-logs-compression/run.sh diff --git a/actions/actions.sh b/actions/actions.sh index 0311d68..e62debf 100755 --- a/actions/actions.sh +++ b/actions/actions.sh @@ -126,13 +126,6 @@ function test_actions() { log_info "Testing actions with Forgejo $version & Forgejo runner $runner_version" - run actions_verify_example echo - if dpkg --compare-versions $version ge 9.0; then - # depends on run actions_verify_example echo - # run it immediately after - run actions_verify_feature logs-compression - fi - run actions_verify_example with-docker-tcp if dpkg --compare-versions $runner_version gt 5.0.2; then for example in with-docker-host with-docker-socket without-docker-socket; do @@ -150,7 +143,7 @@ function test_actions() { done fi - for example in config-options cache checkout service container expression local-action docker-action if if-fail push tag push-cancel artifacts pull-request context; do + for example in echo config-options cache checkout service container expression local-action docker-action if if-fail push tag push-cancel artifacts pull-request context; do run actions_verify_example $example done diff --git a/actions/feature-logs-compression/run.sh b/actions/feature-logs-compression/run.sh deleted file mode 100755 index 7502fbd..0000000 --- a/actions/feature-logs-compression/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -e - -source $FEATURE_DIR/../../lib/lib.sh -source $FEATURE_DIR/../../forgejo/fixtures.sh - -if ! retry bash -c "find $DIR/forgejo-work-path/data/actions_log/root/example-echo | grep --quiet log.zst"; then - ( - cd $DIR/forgejo-work-path - find data - ) - echo expected a single log.zst file in data/actions_log/root/example-echo - exit 1 -fi