fix fail test with cover flag (release-2.5)

Backport of hyperledger#5117.

Signed-off-by: Fedor Partanskiy <fedor.partanskiy@atme.com>

Author: pfi79

.github/workflows/verify-build.yml

@@ -34,8 +34,6 @@ jobs:
     name: Unit Tests
     needs: basic-checks
     runs-on: ${{ github.repository == 'hyperledger/fabric' && 'fabric-ubuntu-20.04' || 'ubuntu-20.04' }}
-    env:
-      GOEXPERIMENT: nocoverageredesign
     steps:
       - uses: actions/checkout@v4
         name: Checkout Fabric Code

core/handlers/library/registry_plugin_test.go

@@ -47,7 +47,7 @@ func buildPlugin(t *testing.T, dest, pkg string) {
 	require.NoError(t, err, "Could not build plugin: "+string(output))
 }
 
-func TestLoadAuthPlugin(t *testing.T) {
+func TestLoadAuthPluginNoCover(t *testing.T) {
 	if noplugin {
 		t.Skip("plugins disabled")
 	}
@@ -69,7 +69,7 @@ func TestLoadAuthPlugin(t *testing.T) {
 	require.True(t, endorser.invoked, "Expected filter to invoke endorser on invoke")
 }
 
-func TestLoadDecoratorPlugin(t *testing.T) {
+func TestLoadDecoratorPluginNoCover(t *testing.T) {
 	if noplugin {
 		t.Skip("plugins disabled")
 	}
@@ -92,7 +92,7 @@ func TestLoadDecoratorPlugin(t *testing.T) {
 	require.True(t, proto.Equal(decoratedInput, testInput), "Expected chaincode input to remain unchanged")
 }
 
-func TestEndorsementPlugin(t *testing.T) {
+func TestEndorsementPluginNoCover(t *testing.T) {
 	if noplugin {
 		t.Skip("plugins disabled")
 	}
@@ -117,7 +117,7 @@ func TestEndorsementPlugin(t *testing.T) {
 	require.Equal(t, []byte{1, 2, 3}, output)
 }
 
-func TestValidationPlugin(t *testing.T) {
+func TestValidationPluginNoCover(t *testing.T) {
 	if noplugin {
 		t.Skip("plugins disabled")
 	}

scripts/run-unit-tests.sh

@@ -18,6 +18,10 @@ serial_packages=(
     "github.com/hyperledger/fabric/gossip/..."
 )
 
+no_coverage_packages=(
+    "github.com/hyperledger/fabric/core/handlers/library"
+)
+
 # packages which need to be tested with build tag pkcs11
 pkcs11_packages=(
     "github.com/hyperledger/fabric/bccsp/factory"
@@ -132,10 +136,18 @@ serial_test_packages() {
     fi
 }
 
+no_coverage_test_packages() {
+    local filter
+    filter=$(package_filter "${no_coverage_packages[@]}")
+    if [ -n "$filter" ]; then
+        join_by $'\n' "$@" | grep -E "$filter" || true
+    fi
+}
+
 # "go test" the provided packages. Packages that are not present in the serial package list
 # will be tested in parallel
 run_tests() {
-    local -a flags=("-cover")
+    local -a flags
     if [ -n "${VERBOSE}" ]; then
         flags+=("-v")
     fi
@@ -153,21 +165,33 @@ run_tests() {
         local -a serial
         while IFS= read -r pkg; do serial+=("$pkg"); done < <(serial_test_packages "$@")
         if [ "${#serial[@]}" -ne 0 ]; then
-            go test "${flags[@]}" -failfast -tags "$GO_TAGS" "${serial[@]}" -short -p 1 -timeout=20m
+            go test -cover "${flags[@]}" -failfast -tags "$GO_TAGS" "${serial[@]}" -short -p 1 -timeout=20m
         fi
 
         local -a parallel
         while IFS= read -r pkg; do parallel+=("$pkg"); done < <(parallel_test_packages "$@")
         if [ "${#parallel[@]}" -ne 0 ]; then
-            go test "${flags[@]}" "${race_flags[@]}" -tags "$GO_TAGS" "${parallel[@]}" -short -timeout=20m
+            go test -cover "${flags[@]}" "${race_flags[@]}" -tags "$GO_TAGS" "${parallel[@]}" -short -timeout=20m -skip=NoCover
+        fi
+
+        # The -cover flag changes the import table of the test and the plugin
+        # so that they cannot interact with each other.
+        # In the name of tests that work with plugins we added the suffix NoCover
+        # and do not run these tests with the -cover flag.
+        # We run such tests separately, without the -cover flag.
+        local -a no_coverage
+        while IFS= read -r pkg; do no_coverage+=("$pkg"); done < <(no_coverage_test_packages "$@")
+        if [ "${#no_coverage[@]}" -ne 0 ]; then
+            echo "test with no coverage"
+            go test "${flags[@]}" "${race_flags[@]}" -tags "$GO_TAGS" "${no_coverage[@]}" -short -timeout=20m -run=NoCover
         fi
     }
 }
 
 # "go test" the provided packages and generate code coverage reports.
 run_tests_with_coverage() {
     # run the tests serially
-    time go test -p 1 -cover -coverprofile=profile_tmp.cov -tags "$GO_TAGS" "$@" -timeout=20m
+    time go test -p 1 -cover -coverprofile=profile_tmp.cov -tags "$GO_TAGS" "$@" -timeout=20m -skip=NoCover
     tail -n +2 profile_tmp.cov >> profile.cov && rm profile_tmp.cov
 }