This commit is contained in:
Jim Paine 2021-09-10 12:02:10 +01:00 коммит произвёл GitHub
Родитель 9d1f93d3ef
Коммит 00a6bff0be
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 139 добавлений и 5 удалений

Просмотреть файл

@ -1,6 +1,8 @@
#! /bin/bash
path_to_lignator=$1
rm -fr ./logs
echo "Using: $path_to_lignator"
echo -e "\e[1;33;4;44mENV TESTS\e[m"
@ -77,6 +79,138 @@ else
fi
unset lignator_output
# lignator_clean
echo -e "\e[1;33;4;44mTEST: lignator_clean\e[m"
echo -e "\n## TEST: lignator_clean\n" >> test-results.md
export lignator_clean=true
result=$($path_to_lignator -t 'uuid: ${uuid}' -l 10 | egrep "^uuid: [[:alnum:]]{8}\b-[[:alnum:]]{4}\b-[[:alnum:]]{4}\b-[[:alnum:]]{4}\b-[[:alnum:]]{12}$" | sort | uniq -u | wc -l)
if [[ -f "./logs/lignator.log" ]];
then
failed=$(($failed+1))
echo -e "expected: \e[32m No logs \e[m actual: \e[31m Logs found \e[m outcome: \e[31mFAILED\e[m"
echo -e "❌ expected: No logs actual Logs found outcome: FAILED" >> test-results.md
else
passed=$(($passed+1))
echo -e "expected: \e[32m No logs \e[m actual: \e[32m No logs \e[m outcome: \e[32mPASSED\e[m"
echo -e "✔️ expected: No logs actual No logs outcome: PASSED" >> test-results.md
fi
unset lignator_clean
# lignator_infinite
echo -e "\e[1;33;4;44mTEST: lignator_infinite\e[m"
echo -e "\n## TEST: lignator_infinite\n" >> test-results.md
export lignator_infinite=true
export lignator_log_level=Information
$path_to_lignator -t 'uuid: ${uuid}' -l 10 > ./output.test &
pid=$(pidof $path_to_lignator)
sleep 1
kill $pid
result=$(cat ./output.test | egrep "infinite flag == true, will run until the process is stopped$" | wc -l)
if [[ $result != 1 ]];
then
failed=$(($failed+1))
echo -e "expected: \e[32m warning for infinite \e[m actual: \e[31m No info log \e[m outcome: \e[31mFAILED\e[m"
echo -e "❌ expected: warning for infinite actual No info log outcome: FAILED" >> test-results.md
else
passed=$(($passed+1))
echo -e "expected: \e[32m warning for infinite \e[m actual: \e[32m warning for infinite \e[m outcome: \e[32mPASSED\e[m"
echo -e "✔️ expected: warning for infinite actual warning for infinite outcome: PASSED" >> test-results.md
fi
rm -f ./output.test
unset lignator_infinite
export lignator_log_level=None
# lignator_extension
echo -e "\e[1;33;4;44mTEST: lignator_extension\e[m"
echo -e "\n## TEST: lignator_extension\n" >> test-results.md
export lignator_extension='test'
result=$($path_to_lignator -t 'uuid: ${uuid}' -l 10 | egrep "^uuid: [[:alnum:]]{8}\b-[[:alnum:]]{4}\b-[[:alnum:]]{4}\b-[[:alnum:]]{4}\b-[[:alnum:]]{12}$" | sort | uniq -u | wc -l)
if [[ ! -f "./logs/lignator.test" ]];
then
failed=$(($failed+1))
echo -e "expected: \e[32m lignator.$lignator_extension \e[m actual: \e[31m lignator.$lignator_extension \e[m outcome: \e[31mFAILED\e[m"
echo -e "❌ expected: lignator.$lignator_extension actual lignator.$lignator_extension outcome: FAILED" >> test-results.md
else
passed=$(($passed+1))
echo -e "expected: \e[32m lignator.$lignator_extension \e[m actual: \e[32m lignator.$lignator_extension \e[m outcome: \e[32mPASSED\e[m"
echo -e "✔️ expected: lignator.$lignator_extension actual lignator.$lignator_extension outcome: PASSED" >> test-results.md
fi
unset lignator_extension
# lignator_multiline
echo -e "\e[1;33;4;44mTEST: lignator_multiline\e[m"
echo -e "\n## TEST: lignator_multiline\n" >> test-results.md
echo -e "hello\nworld" > ./input.test
export lignator_multiline=true
$path_to_lignator -t '$PWD/input.test'
result=$(cat $PWD/input.test | egrep "hello|world" | wc -l)
if [[ $result != "2" ]];
then
failed=$(($failed+1))
echo -e "expected: \e[32m 2 logs \e[m actual: \e[31m $result logs \e[m outcome: \e[31mFAILED\e[m"
echo -e "❌ expected: 2 logs actual $result logs outcome: FAILED" >> test-results.md
else
passed=$(($passed+1))
echo -e "expected: \e[32m 2 logs \e[m actual: \e[32m $result logs \e[m outcome: \e[32mPASSED\e[m"
echo -e "✔️ expected: 2 logs actual $result logs outcome: PASSED" >> test-results.md
fi
rm -f ./input.test
rm -fr ./logs
unset lignator_multiline
# lignator_head
echo -e "\e[1;33;4;44mTEST: lignator_head\e[m"
echo -e "\n## TEST: lignator_head\n" >> test-results.md
export lignator_head='Not the tail'
result=$($path_to_lignator -t 'uuid: ${uuid}' -l 10 && head -n 1 ./logs/lignator.log)
if [[ $result != $lignator_head ]];
then
failed=$(($failed+1))
echo -e "expected: \e[32m $lignator_head \e[m actual: \e[31m $result \e[m outcome: \e[31mFAILED\e[m"
echo -e "❌ expected: $lignator_head actual $result outcome: FAILED" >> test-results.md
else
passed=$(($passed+1))
echo -e "expected: \e[32m $lignator_head \e[m actual: \e[32m $result \e[m outcome: \e[32mPASSED\e[m"
echo -e "✔️ expected: $lignator_head actual $result outcome: PASSED" >> test-results.md
fi
unset lignator_head
# lignator_tail
echo -e "\e[1;33;4;44mTEST: lignator_tail\e[m"
echo -e "\n## TEST: lignator_tail\n" >> test-results.md
export lignator_tail='Not the head'
result=$($path_to_lignator -t 'uuid: ${uuid}' -l 10 && tail -n 1 ./logs/lignator.log)
if [[ $result != $lignator_tail ]];
then
failed=$(($failed+1))
echo -e "expected: \e[32m $lignator_tail \e[m actual: \e[31m $result \e[m outcome: \e[31mFAILED\e[m"
echo -e "❌ expected: $lignator_tail actual $result outcome: FAILED" >> test-results.md
else
passed=$(($passed+1))
echo -e "expected: \e[32m $lignator_tail \e[m actual: \e[32m $result \e[m outcome: \e[32mPASSED\e[m"
echo -e "✔️ expected: $lignator_tail actual $result outcome: PASSED" >> test-results.md
fi
unset lignator_tail
# lignator_variables
rm -fr ./logs
echo -e "\e[1;33;4;44mTEST: lignator_variables\e[m"
echo -e "\n## TEST: lignator_variables\n" >> test-results.md
export lignator_variables='one=Hello;two=World'
result=$($path_to_lignator -t '${variable(one)} ${variable(two)}' && head -n 1 ./logs/lignator.log)
if [[ $result != "Hello World" ]];
then
failed=$(($failed+1))
echo -e "expected: \e[32m Hello World \e[m actual: \e[31m $result \e[m outcome: \e[31mFAILED\e[m"
echo -e "❌ expected: Hello World actual $result outcome: FAILED" >> test-results.md
else
passed=$(($passed+1))
echo -e "expected: \e[32m Hello World \e[m actual: \e[32m $result \e[m outcome: \e[32mPASSED\e[m"
echo -e "✔️ expected: Hello World actual $result outcome: PASSED" >> test-results.md
fi
rm -fr ./logs
unset lignator_variables
total=$(($passed+$failed))
echo -e "\e[1;33;4;44mRESULTS\e[m"
echo -e "\n# RESULTS\n" >> test-results.md
@ -87,7 +221,9 @@ echo -e "❌ Failed: $failed" >> test-results.md
echo -e "\e[32m Total: $total\e[m"
echo -e "🏁 Total: $total" >> test-results.md
rm -fr ./logs
if [[ $failed != 0 ]];
then
exit 1
fi
fi

Просмотреть файл

@ -43,7 +43,7 @@ namespace Lignator
string variablesDefault = configuration.GetValue<string>("variables");
Option<string[]> variablesOption = new Option<string[]>(
new string[] { "--variable", "-V" },
() => string.IsNullOrWhiteSpace(variablesDefault) ? null : variablesDefault.Split(";"), // env variable would be equal to "myid=%{uuid}%;currenttimestamp=%{utcnow()}%"
() => string.IsNullOrWhiteSpace(variablesDefault) ? null : variablesDefault.Split(";"), // env variable would be equal to "myid=${uuid};currenttimestamp=${utcnow()}"
description: "Key value pairs for variable declaration, they can also be templates");
RootCommand command = new RootCommand
@ -71,9 +71,7 @@ namespace Lignator
private static Option<T> GetOption<T>(string environmentName, T defaultValue, string[] aliases, string description)
{
return defaultValue != null
? new Option<T>(aliases, () => configuration.GetValue<T>(environmentName, defaultValue), description)
: new Option<T>(aliases, description);
return new Option<T>(aliases, () => configuration.GetValue<T>(environmentName, defaultValue), description);
}
}
}