From ad988085f69ad8f8b9ec5037e558c94ba9b75dbd Mon Sep 17 00:00:00 2001 From: Kenichi Omichi Date: Wed, 31 Jul 2019 03:30:55 +0000 Subject: [PATCH] Add code check for framework.ExpectEqual() This adds code check for using framework.ExpectEqual(foo, bar) in e2e tests for keeping the test code simple. --- hack/verify-test-code.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/hack/verify-test-code.sh b/hack/verify-test-code.sh index 84a3797b420..992cd6fda10 100755 --- a/hack/verify-test-code.sh +++ b/hack/verify-test-code.sh @@ -42,6 +42,15 @@ do fi done +errors_expect_equal=() +for file in "${all_e2e_files[@]}" +do + if grep -E "Expect\(.*\)\.To\((gomega\.Equal|Equal)" "${file}" > /dev/null + then + errors_expect_equal+=( "${file}" ) + fi +done + if [ ${#errors_expect_no_error[@]} -ne 0 ]; then { echo "Errors:" @@ -70,4 +79,18 @@ if [ ${#errors_expect_error[@]} -ne 0 ]; then exit 1 fi +if [ ${#errors_expect_equal[@]} -ne 0 ]; then + { + echo "Errors:" + for err in "${errors_expect_equal[@]}"; do + echo "$err" + done + echo + echo 'The above files need to use framework.ExpectEqual(foo, bar) instead of ' + echo 'Expect(foo).To(Equal(bar)) or gomega.Expect(foo).To(gomega.Equal(bar))' + echo + } >&2 + exit 1 +fi + echo 'Congratulations! All e2e test source files are valid.'