clearlinux/swupd-client
2
0
Fork 0
mirror of https://github.com/clearlinux/swupd-client.git synced 2026-09-07 22:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding new assertions to the test library

Browse Source 
This commit include two parts.

1) It adds 6 new assertions to the test library:
- assert_is_output
- assert_is_not_output
- assert_regex_is_output
- assert_regex_is_not_output
- assert_regex_in_output
- assert_regex_not_in_output

2) It migrates the tests from the following categories to use the
new library:
- completion
- hashdump
- mirror
- search

Finally this commit changes a few test cases so they use
"assert_is_output" instead of "assert_in_output", that way
we can have a tighter control of the output we want since
assert_is_output requires the whole output to match to a
specific text instead of doing a partial match.
This commit is contained in:
Castulo Martinez
2018-08-07 12:47:51 -07:00
committed by Matthew Johnson
parent 3d8c0a727d
commit 2fcca957da
42 changed files with 649 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/functional/testlib.bash
+94
View File
@@ -126,6 +126,7 @@ set_env_variables() {
export SWUPD_OPTS="-S $path/$env_name/state -p $path/$env_name/target-dir -F staging -u file://$path/$env_name/web-dir -C $FUNC_DIR/Swupd_Root.pem -I"
export SWUPD_OPTS_NO_CERT="-S $path/$env_name/state -p $path/$env_name/target-dir -F staging -u file://$path/$env_name/web-dir"
export SWUPD_OPTS_MIRROR="-p $path/$env_name/target-dir"
export TEST_DIRNAME="$path"/"$env_name"
}
@@ -513,6 +514,9 @@ create_test_environment() {
printf 'BUG_REPORT_URL="https://bugs.clearlinux.org/jira"\n'
} | sudo tee "$env_name"/target-dir/usr/lib/os-release > /dev/null
sudo mkdir -p "$env_name"/target-dir/usr/share/clear/bundles
sudo mkdir -p "$env_name"/target-dir/usr/share/defaults/swupd
printf '1' | sudo tee "$env_name"/target-dir/usr/share/defaults/swupd/format > /dev/null
sudo mkdir -p "$env_name"/target-dir/etc
# state files & dirs
sudo mkdir -p "$env_name"/state/{staged,download,delta,telemetry}
@@ -1132,6 +1136,96 @@ assert_not_in_output() {
}
assert_is_output() {
local expected_output=$1
local sep="------------------------------------------------------------------"
validate_param expected_output
if [[ ! "$output" == "$expected_output" ]]; then
print_assert_failure "The following text was not the command output:\\n$sep\\n$expected_output\\n$sep"
echo -e "Difference:\\n$sep"
echo "$(diff <(echo "$expected_output") <(echo "$output"))"
return 1
fi
}
assert_is_not_output() {
local expected_output=$1
local sep="------------------------------------------------------------------"
validate_param expected_output
if [[ "$output" == "$expected_output" ]]; then
print_assert_failure "The following text was the command output and should not have:\\n$sep\\n$expected_output\\n$sep"
echo -e "Difference:\\n$sep"
echo "$(diff <(echo "$expected_output") <(echo "$output"))"
return 1
fi
}
assert_regex_in_output() {
local expected_output=$1
local sep="------------------------------------------------------------------"
validate_param expected_output
if [[ ! "$output" =~ $expected_output ]]; then
print_assert_failure "The following text (regex) was not found in the command output:\\n$sep\\n$expected_output\\n$sep"
echo -e "Difference:\\n$sep"
echo "$(diff <(echo "$expected_output") <(echo "$output"))"
return 1
fi
}
assert_regex_not_in_output() {
local expected_output=$1
local sep="------------------------------------------------------------------"
validate_param expected_output
if [[ "$output" =~ $expected_output ]]; then
print_assert_failure "The following text (regex) was found in the command output and should not have:\\n$sep\\n$expected_output\\n$sep"
echo -e "Difference:\\n$sep"
echo "$(diff <(echo "$expected_output") <(echo "$output"))"
return 1
fi
}
assert_regex_is_output() {
local expected_output=$1
local sep="------------------------------------------------------------------"
validate_param expected_output
if [[ ! "$output" =~ ^$expected_output$ ]]; then
print_assert_failure "The following text (regex) was not the command output:\\n$sep\\n$expected_output\\n$sep"
echo -e "Difference:\\n$sep"
echo "$(diff <(echo "$expected_output") <(echo "$output"))"
return 1
fi
}
assert_regex_is_not_output() {
local expected_output=$1
local sep="------------------------------------------------------------------"
validate_param expected_output
if [[ "$output" =~ ^$expected_output$ ]]; then
print_assert_failure "The following text (regex) was the command output and should not have:\\n$sep\\n$expected_output\\n$sep"
echo -e "Difference:\\n$sep"
echo "$(diff <(echo "$expected_output") <(echo "$output"))"
return 1
fi
}
assert_equal() {
local val1=$1