Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ on:
jobs:
cfengine_cli:
uses: ./.github/workflows/cfengine_cli.yml
unit_tests:
needs: cfengine_cli
uses: ./.github/workflows/unit_tests.yml
# unit_tests:
# needs: cfengine_cli
# uses: ./.github/workflows/unit_tests.yml
shellcheck_tests:
uses: ./.github/workflows/shellcheck.yml
asan_unit_tests:
needs: unit_tests
uses: ./.github/workflows/asan_unit_tests.yml
acceptance_tests:
needs: unit_tests
uses: ./.github/workflows/acceptance_tests.yml
# asan_unit_tests:
# needs: unit_tests
# uses: ./.github/workflows/asan_unit_tests.yml
# acceptance_tests:
# needs: unit_tests
# uses: ./.github/workflows/acceptance_tests.yml
reactor_tests:
needs: unit_tests
uses: ./.github/workflows/reactor_tests.yml
macos_unit_tests:
needs: unit_tests
uses: ./.github/workflows/macos_unit_tests.yml
static_check:
needs: unit_tests
uses: ./.github/workflows/job-static-check.yml
valgrind_check:
needs: unit_tests
uses: ./.github/workflows/job-valgrind-check.yml
# macos_unit_tests:
# needs: unit_tests
# uses: ./.github/workflows/macos_unit_tests.yml
# static_check:
# needs: unit_tests
# uses: ./.github/workflows/job-static-check.yml
# valgrind_check:
# needs: unit_tests
# uses: ./.github/workflows/job-valgrind-check.yml
16 changes: 11 additions & 5 deletions tests/reactor/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ log_offset=0

# Run command $@ until it succeeds, for at most WAIT_TIMEOUT seconds, polling
# every 0.1 second. Fails if it never succeeded. Runs in a subshell without
# tracing, so that set -x doesn't log every poll.
# tracing, so that set -x doesn't log every poll. The deadline is based on the
# clock rather than a poll count, since a poll can take much longer than 0.1
# second where starting processes is slow (e.g. MSYS2 on Windows).
wait_until() {
(
set +x
polls=$((WAIT_TIMEOUT * 10))
deadline=$(($(now) + WAIT_TIMEOUT))
until "$@"; do
[ "$polls" -gt 0 ] || exit 1
polls=$((polls - 1))
[ "$(now)" -lt "$deadline" ] || exit 1
sleep 0.1
done
)
Expand Down Expand Up @@ -170,8 +171,13 @@ set_installed_packages() {
# Start cf-reactor in the background with policy file $1, logging to $LOG.
# It is stopped when the test exits.
start_reactor() {
"$CF_REACTOR" --no-fork --verbose -f "$1" >>"$LOG" 2>&1 &
"$CF_REACTOR" --no-fork --debug -f "$1" >>"$LOG" 2>&1 &
reactor_pid=$!
echo "reactor_pid is $reactor_pid"
if grep 'error:' "$LOG"; then
stop_reactor
exit 1
fi
trap stop_reactor EXIT
}

Expand Down
12 changes: 9 additions & 3 deletions tests/reactor/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,13 @@ run_test() {
total=$((total + 1))

start=$(now)
output=$(sh "$dir/run_test.sh" "$1" 2>&1)
result=$?
# The exit status of a pipeline is that of its last command, tee here, so
# record the one of the test in a file
{
sh -ex "$dir/run_test.sh" "$1" 2>&1 && rc=0 || rc=$?
echo "$rc" > "$1".rc
} | tee "$1".log
result=$(cat "$1".rc)
elapsed=$(($(now) - start))

case $result in
Expand All @@ -55,10 +60,11 @@ run_test() {
failures="$failures $name
"
echo "--- FAIL: $name (${elapsed}s)"
echo "$output"
cat "$1".log
echo "---"
;;
esac
rm -f "$1".log "$1".rc
}

for t in "$dir"/tests/*/*.sh "$dir"/tests/*/unsafe/*.sh; do
Expand Down
49 changes: 45 additions & 4 deletions tests/reactor/run_test.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/sh
set -ex

# Usage: run_test.sh TEST
#
Expand Down Expand Up @@ -40,7 +41,16 @@ REACTOR_TESTS_DIR=$(cd "$(dirname "$0")" && pwd)
# Print the path of binary $1, see the usage above.
find_binary() {
if [ -n "$CF_BINDIR" ]; then
echo "$CF_BINDIR/$1"
if [ -x "$CF_BINDIR/$1.exe" ]; then
echo "$CF_BINDIR/$1.exe"
return
fi
if [ -x "$CF_BINDIR/$1" ]; then
echo "$CF_BINDIR/$1"
return
fi
echo "Unable to find executable for $1 in $CF_BINDIR"
exit 1
elif [ -x "$REACTOR_TESTS_DIR/../../$1/$1" ]; then
# in-tree build, may be a libtool wrapper script
echo "$REACTOR_TESTS_DIR/../../$1/$1"
Expand All @@ -51,7 +61,10 @@ find_binary() {

CF_REACTOR=${CF_REACTOR:-$(find_binary cf-reactor)}
CF_PROMISES=${CF_PROMISES:-$(find_binary cf-promises)}
CF_AGENT=${CF_AGENT:-$(find_binary cf-agent)}
export CF_REACTOR
export CF_PROMISES
export CF_AGENT

for b in "$CF_REACTOR" "$CF_PROMISES"; do
if [ ! -x "$b" ]; then
Expand All @@ -66,9 +79,27 @@ WORKDIR=$(mktemp -d "${TMPDIR:-/tmp}/cf-reactor-test.XXXXXX" 2>/dev/null) || {
(umask 077 && mkdir "$WORKDIR") || exit 2
}
WORKDIR=$(cd "$WORKDIR" && pwd)
# On Windows (MSYS2/Cygwin), use the C:/... form of the path: the native
# binaries get POSIX-looking paths (/c/...) converted when passed through env
# vars or arguments, so the paths they log and record wouldn't match the ones
# the tests look for. The shell tools accept the C:/... form as well.
if command -v cygpath >/dev/null 2>&1; then
WORKDIR=$(cygpath -m "$WORKDIR")
fi
trap 'rm -rf "$WORKDIR"' EXIT
mkdir -p "$WORKDIR/bin" "$WORKDIR/tmp"
ln -s "$CF_PROMISES" "$WORKDIR/bin/cf-promises"

ext=""
case "$CF_PROMISES" in *.exe) ext=".exe" ;; esac
ln -s "$CF_PROMISES" "$WORKDIR/bin/cf-promises$ext"
ln -s "$CF_REACTOR" "$WORKDIR/bin/cf-reactor"
ln -s "$CF_AGENT" "$WORKDIR/bin/cf-agent"

# on windows ln -s copies, so the copied exes need their DLLs alongside
if [ -n "$ext" ]; then
cp "$(dirname "$CF_PROMISES")"/*.dll "$WORKDIR/bin/"
fi


# Run a copy of the policy, keeping its path relative to lib.cf, as CFEngine
# refuses to read policy files writable by group or others, which those of a
Expand All @@ -86,9 +117,19 @@ LOG="$WORKDIR/reactor.log"
PROMISE_NAME=$(basename "$t" .sh)
export WORKDIR CFENGINE_TEST_OVERRIDE_WORKDIR LOG PROMISE_NAME

sh "$t" "$policy" > "$WORKDIR/test.log" 2>&1
result=$?
echo "--- Validate test policy $policy ---"
"$CF_PROMISES" -dc "$policy"

echo "--- Begin test $t ---"
# The exit status of a pipeline is that of its last command, tee here, so
# record the one of the test in a file
{
bash -ex "$t" "$policy" 2>&1 && rc=0 || rc=$?
echo "$rc" > "$WORKDIR/test.rc"
} | tee "$WORKDIR/test.log"
result=$(cat "$WORKDIR/test.rc")
if [ "$result" -ne 0 ]; then
cat "$WORKDIR/test.log"
fi
echo "--- End test $t with exit code $result ---"
exit "$result"
15 changes: 15 additions & 0 deletions tests/reactor/win-run.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/sh
set -ex

export CF_BINDIR="/c/Program Files/CFEngine/bin"
dir=$(cd "$(dirname "$0")" && pwd)
export TMPDIR="$dir"/tmp
mkdir -p "$TMPDIR"

# The exit status of a pipeline is that of its last command, tee here, so
# record the one of run.sh in a file and exit with it
{
bash -ex "$dir"/run.sh 2>&1 && rc=0 || rc=$?
echo "$rc" > "$TMPDIR/run.rc"
} | tee test.log
exit "$(cat "$TMPDIR/run.rc")"
Loading