From 393d1a464269175d5d120f5f8ee17314ec1abb34 Mon Sep 17 00:00:00 2001 From: Max Hoffman Date: Thu, 28 Jul 2022 13:20:43 -0700 Subject: [PATCH 1/5] prep counter with failure --- .github/workflows/format.yml | 2 ++ enginetest/memory_engine_test.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index e98606eb3b..1739f102fa 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -62,6 +62,7 @@ jobs: id: check_format run: | ./check_repo.sh + ./check_prepared_tests.sh env: BRANCH_NAME: ${{ github.head_ref }} CHANGE_TARGET: ${{ github.base_ref }} @@ -84,6 +85,7 @@ jobs: if [ "$code" != 0 ]; then echo "Please run ./format_repo.sh to fix this pull request's formatting" fi + ./check_prepared_tests.sh env: BRANCH_NAME: ${{ github.head_ref }} CHANGE_TARGET: ${{ github.base_ref }} diff --git a/enginetest/memory_engine_test.go b/enginetest/memory_engine_test.go index 28e404af3d..8d0cabfde4 100644 --- a/enginetest/memory_engine_test.go +++ b/enginetest/memory_engine_test.go @@ -41,6 +41,8 @@ type indexBehaviorTestParams struct { nativeIndexes bool } +const SkipPreparedsCount = 90 + const testNumPartitions = 5 var numPartitionsVals = []int{ From dcaa58249f0a6b698be7c6b152fc885299758fca Mon Sep 17 00:00:00 2001 From: Max Hoffman Date: Thu, 28 Jul 2022 13:23:54 -0700 Subject: [PATCH 2/5] fix count --- enginetest/memory_engine_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enginetest/memory_engine_test.go b/enginetest/memory_engine_test.go index 8d0cabfde4..fd53edc34d 100644 --- a/enginetest/memory_engine_test.go +++ b/enginetest/memory_engine_test.go @@ -41,7 +41,7 @@ type indexBehaviorTestParams struct { nativeIndexes bool } -const SkipPreparedsCount = 90 +const SkipPreparedsCount = 91 const testNumPartitions = 5 From 5c91852ee01b3a386cf62c7c7e79c0a6cda6edc6 Mon Sep 17 00:00:00 2001 From: Max Hoffman Date: Thu, 28 Jul 2022 13:27:56 -0700 Subject: [PATCH 3/5] missed prep test --- check_prepared_tests.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 check_prepared_tests.sh diff --git a/check_prepared_tests.sh b/check_prepared_tests.sh new file mode 100755 index 0000000000..9eec824de0 --- /dev/null +++ b/check_prepared_tests.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +set -eo pipefail + +enginetest_path=enginetest/memory_engine_test.go +all_cnt=$(grep "func Test.*" "$enginetest_path" | wc -l | tr -dc '0-9') +prep_cnt=$(grep "func Test.*Prepared" "$enginetest_path" | wc -l | tr -dc '0-9') +skip_cnt=$(grep "SkipPreparedsCount" "$enginetest_path" | awk '{print $4}' | tr -dc '0-9') + +expected="$((all_cnt-skip_cnt))" +if [[ "$expected" != "$prep_cnt" ]]; then + echo "Expected '$expected' TestPrepared enginetests in $enginetest_path, found: '$prep_cnt'" + echo "Either increment SkipPreparedsCount or add a prepared test for the new test suite" + exit 1 +fi + From 96d3b9822449fe7269ea3ba388ab0a0007c27ca3 Mon Sep 17 00:00:00 2001 From: Max Hoffman Date: Thu, 28 Jul 2022 13:31:19 -0700 Subject: [PATCH 4/5] break test one more time to check --- enginetest/memory_engine_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enginetest/memory_engine_test.go b/enginetest/memory_engine_test.go index fd53edc34d..8d0cabfde4 100644 --- a/enginetest/memory_engine_test.go +++ b/enginetest/memory_engine_test.go @@ -41,7 +41,7 @@ type indexBehaviorTestParams struct { nativeIndexes bool } -const SkipPreparedsCount = 91 +const SkipPreparedsCount = 90 const testNumPartitions = 5 From 07b6447005da5151edc4193d2dacfd45d532079e Mon Sep 17 00:00:00 2001 From: Max Hoffman Date: Thu, 28 Jul 2022 13:33:18 -0700 Subject: [PATCH 5/5] fix test last time --- enginetest/memory_engine_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enginetest/memory_engine_test.go b/enginetest/memory_engine_test.go index 8d0cabfde4..fd53edc34d 100644 --- a/enginetest/memory_engine_test.go +++ b/enginetest/memory_engine_test.go @@ -41,7 +41,7 @@ type indexBehaviorTestParams struct { nativeIndexes bool } -const SkipPreparedsCount = 90 +const SkipPreparedsCount = 91 const testNumPartitions = 5