Merge pull request #46 from pwittrock/coverage

update test.sh to enforce coverage on inject and signals

Author: k8s-ci-robot

pkg/runtime/log/log.go

@@ -23,11 +23,15 @@ func ZapLogger(development bool) logr.Logger {
 		zapLogCfg := zap.NewProductionConfig()
 		zapLog, err = zapLogCfg.Build(zap.AddCallerSkip(1))
 	}
+	// who watches the watchmen?
+	fatalIfErr(err, log.Fatalf)
+	return zaplogr.NewLogger(zapLog)
+}
+
+func fatalIfErr(err error, f func(format string, v ...interface{})) {
 	if err != nil {
-		// who watches the watchmen?
-		log.Fatalf("unable to construct the logger: %v", err)
+		f("unable to construct the logger: %v", err)
 	}
-	return zaplogr.NewLogger(zapLog)
 }
 
 // SetLogger sets a concrete logging implementation for all deferred Loggers.

pkg/runtime/log/log_test.go

@@ -17,6 +17,8 @@ limitations under the License.
 package log
 
 import (
+	"fmt"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	tlogr "github.com/thockin/logr/testing"
@@ -58,7 +60,26 @@ var _ = Describe("runtime log", func() {
 			Log.WithTags(tags)
 			Expect(Log.Logger).To(Equal(test))
 		})
+	})
 
+	Describe("fataliferr", func() {
+		It("should not call the fn if there is not an error", func() {
+			called := false
+			fn := func(format string, v ...interface{}) {
+				called = true
+			}
+			fatalIfErr(nil, fn)
+			Expect(called).To(BeFalse())
+		})
+
+		It("should call the fn if there is an error", func() {
+			called := false
+			fn := func(format string, v ...interface{}) {
+				called = true
+			}
+			fatalIfErr(fmt.Errorf("error"), fn)
+			Expect(called).To(BeTrue())
+		})
 	})
 
 })

test.sh

@@ -154,11 +154,13 @@ header_text "running coverage"
 
 # Verify no coverage regressions have been introduced.  Remove the exception list from here
 # once the coverage has been brought back up
-if [[ ! $(go test ./pkg/...  -coverprofile cover.out -parallel 4 | grep -v "coverage: 100.0% of statements"  | grep -v "controller-runtime/pkg\|pkg/admission/certprovisioner\|pkg/internal/admission\|pkg/cache\|pkg/client\|pkg/event\|pkg/client/config\|pkg/controller/controllertest\|pkg/reconcile/reconciletest\|pkg/runtime/inject\|pkg/runtime/log\|pkg/runtime/signals\|pkg/test\|pkg/runtime/inject\|pkg/runtime/signals") ]]; then
+if [[ ! $(go test ./pkg/...  -coverprofile cover.out -parallel 4 | grep -v "coverage: 100.0% of statements" | grep "controller-runtime/pkg " | grep -v "controller-runtime/pkg \|controller-runtime/pkg/recorder \|pkg/admission/certprovisioner \|pkg/internal/admission \|pkg/cache\|pkg/client \|pkg/event \|pkg/client/config \|pkg/controller/controllertest \|pkg/reconcile/reconciletest \|pkg/test ") ]]; then
 echo "ok"
 else
-go test ./pkg/...  -coverprofile cover.out -parallel 4 | grep -v "coverage: 100.0% of statements"  | grep -v "controller-runtime/pkg\|pkg/admission/certprovisioner\|pkg/internal/admission\|pkg/cache\|pkg/client\|pkg/event\|pkg/client/config\|pkg/controller/controllertest\|pkg/reconcile/reconciletest\|pkg/runtime/inject\|pkg/runtime/log\|pkg/runtime/signals\|pkg/test\|pkg/runtime/inject\|pkg/runtime/signals"
+go test ./pkg/...  -coverprofile cover.out -parallel 4 | grep -v "coverage: 100.0% of statements" | grep "controller-runtime/pkg " | grep -v "controller-runtime/pkg \|controller-runtime/pkg/recorder \|pkg/admission/certprovisioner \|pkg/internal/admission \|pkg/cache\|pkg/client \|pkg/event \|pkg/client/config \|pkg/controller/controllertest \|pkg/reconcile/reconciletest \|pkg/test "
 echo "missing test coverage"
 exit 1
 fi
 
+echo "passed"
+exit 0