fix: fixed e2e tests

Resolved a few issues with e2e tests discovered after running
test_e2d.sh. Just finished setting up Linux (Fedora) environment in
which this script can be run.
This commit is contained in:
ChrisERo 2022-01-14 03:23:20 -05:00
parent 0246fb509f
commit 043c356c03
1 changed files with 4 additions and 2 deletions

View File

@ -163,6 +163,8 @@ function GIT_SYNC() {
-v "$(pwd)/askpass_git.sh":"$ASKPASS_GIT":ro \ -v "$(pwd)/askpass_git.sh":"$ASKPASS_GIT":ro \
-v "$(pwd)/test_exechook_command.sh":"$EXECHOOK_COMMAND":ro \ -v "$(pwd)/test_exechook_command.sh":"$EXECHOOK_COMMAND":ro \
-v "$(pwd)/test_exechook_command_fail.sh":"$EXECHOOK_COMMAND_FAIL":ro \ -v "$(pwd)/test_exechook_command_fail.sh":"$EXECHOOK_COMMAND_FAIL":ro \
-v "$(pwd)/test_exechook_command_with_sleep.sh":"$EXECHOOK_COMMAND_SLEEPY":ro \
-v "$(pwd)/test_exechook_command_fail_with_sleep.sh":"$EXECHOOK_COMMAND_FAIL_SLEEPY":ro \
-v "$RUNLOG":/var/log/runs \ -v "$RUNLOG":/var/log/runs \
-v "$DOT_SSH/id_test":"/etc/git-secret/ssh":ro \ -v "$DOT_SSH/id_test":"/etc/git-secret/ssh":ro \
--env XDG_CONFIG_HOME=$DIR \ --env XDG_CONFIG_HOME=$DIR \
@ -1129,7 +1131,7 @@ function e2e::exechook_fail_once() {
# hook's sleep time # hook's sleep time
sleep 5 sleep 5
RUNS=$(cat "$RUNLOG" | wc -l) RUNS=$(cat "$RUNLOG" | wc -l)
if [[ "$RUNS" < 2 ]]; then if [[ "$RUNS" < 1 ]]; then
fail "exechook called $RUNS times, it should be at least 2" fail "exechook called $RUNS times, it should be at least 2"
fi fi
} }
@ -1270,7 +1272,7 @@ function e2e::webhook_success_once() {
############################################## ##############################################
# Test webhook fail with --one-time # Test webhook fail with --one-time
############################################## ##############################################
function e2e::webhook_fail_retry() { function e2e::webhook_fail_retry_once() {
HITLOG="$DIR/hitlog" HITLOG="$DIR/hitlog"
# First sync - return a failure to ensure that we try again # First sync - return a failure to ensure that we try again