From 105ad30a29266eafedd8ef79bc21218b92415907 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 12 Apr 2021 18:30:45 +0200 Subject: Merging upstream version 1.30.1. Signed-off-by: Daniel Baumann --- tests/alarm_repetition/alarm.sh.in | 2 +- tests/installer/checksums.sh | 2 +- tests/template_dimension/template_dim.sh.in | 2 +- tests/updater_checks.bats | 2 +- tests/updater_checks.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/alarm_repetition/alarm.sh.in b/tests/alarm_repetition/alarm.sh.in index 09d6aaf46..3ceab6607 100644 --- a/tests/alarm_repetition/alarm.sh.in +++ b/tests/alarm_repetition/alarm.sh.in @@ -84,6 +84,6 @@ cp -a netdata.conf_with_repetition netdata.conf process_data "ram_with" "I" "activated." rm netdata.conf -echo -e "${GREEN} all the tests were sucessful ${NOCOLOR}" +echo -e "${GREEN} all the tests were successful ${NOCOLOR}" rm "$HEALTHDIR/ram.conf" rm -rf $OUTDIR diff --git a/tests/installer/checksums.sh b/tests/installer/checksums.sh index 3fbbfa386..e83e0c23c 100755 --- a/tests/installer/checksums.sh +++ b/tests/installer/checksums.sh @@ -51,4 +51,4 @@ check_file() { check_file kickstart.sh packaging/installer/methods/kickstart.md check_file kickstart-static64.sh packaging/installer/methods/kickstart-64.md -echo "No problems found, exiting succesfully!" +echo "No problems found, exiting successfully!" diff --git a/tests/template_dimension/template_dim.sh.in b/tests/template_dimension/template_dim.sh.in index 88978fd84..007892585 100644 --- a/tests/template_dimension/template_dim.sh.in +++ b/tests/template_dimension/template_dim.sh.in @@ -85,4 +85,4 @@ process_data "foreach_with_template" 10 "$HEALTHDIR/dim_foreach_with_template_sp rm "$HEALTHDIR/dim_foreach_with_template_sp.conf" rm -rf "$OUTDIR" -echo -e "${GREEN} all the tests were sucessful ${NOCOLOR}" +echo -e "${GREEN} all the tests were successful ${NOCOLOR}" diff --git a/tests/updater_checks.bats b/tests/updater_checks.bats index 930cea990..d9f4cc0ca 100755 --- a/tests/updater_checks.bats +++ b/tests/updater_checks.bats @@ -54,7 +54,7 @@ setup() { @test "update netdata using the new updater" { export ENVIRONMENT_FILE="${ENV}" # Run the updater, with the override so that it uses the local repo we have at hand - export NETDATA_LOCAL_TARBAL_OVERRIDE="${PWD}" + export NETDATA_LOCAL_TARBALL_OVERRIDE="${PWD}" ${INSTALLATION}/netdata/usr/libexec/netdata/netdata-updater.sh --not-running-from-cron ! grep "new_installation" "${ENV}" } diff --git a/tests/updater_checks.sh b/tests/updater_checks.sh index dff87a670..1c8d7b028 100755 --- a/tests/updater_checks.sh +++ b/tests/updater_checks.sh @@ -63,7 +63,7 @@ case "${running_os}" in ;; esac -# Run depednency scriptlet, before anything else +# Run dependency scriptlet, before anything else # ./packaging/installer/install-required-packages.sh --non-interactive netdata -- cgit v1.2.3