Integration with grpc-settable logger.

scripts/fix.sh

@@ -2,6 +2,9 @@
 
 set -e
 
+# Top level problems with modules can lead to test_lib being not functional
+go mod tidy
+
 source ./scripts/test_lib.sh
 source ./scripts/updatebom.sh
 
@@ -28,7 +31,6 @@ function bash_ws_fix {
 
 log_callout -e "\\nFixing etcd code for you...\\n"
 
-go mod tidy
 run_for_modules mod_tidy_fix || exit 2
 run_for_modules run ${GO_CMD} fmt || exit 2
 run_for_module tests bom_fix || exit 2

scripts/test_lib.sh

@@ -242,10 +242,6 @@ function go_test {
   if [ "${VERBOSE}" == "1" ]; then
     goTestFlags="-v"
   fi
-  if [ "${VERBOSE}" == "2" ]; then
-    goTestFlags="-v"
-    goTestEnv="CLIENT_DEBUG=1"
-  fi
 
   # Expanding patterns (like ./...) into list of packages
 
@@ -270,6 +266,7 @@ function go_test {
     # shellcheck disable=SC2206
     local cmd=( go test ${goTestFlags} ${additional_flags} "$@" ${pkg} )
 
+    # shellcheck disable=SC2086
     if ! run env ${goTestEnv} "${cmd[@]}" ; then
       if [ "${mode}" != "keep_going" ]; then
         return 2