Merge pull request #4 from vfarcic/my-pr

This is a PR
vfarcic · Jan 6, 2019 · 71cf7b0 · 71cf7b0
2 parents 630e1b1 + 44c1b9d
commit 71cf7b0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -21,6 +21,7 @@ pipeline {
         container('go') {
           dir('/home/jenkins/go/src/github.com/vfarcic/go-demo-6') {
             checkout scm
+            sh "make unit-test"
             sh "make linux"
             sh "export VERSION=$PREVIEW_VERSION && skaffold build -f skaffold.yaml"
             sh "jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION"

diff --git a/Makefile b/Makefile
@@ -60,3 +60,5 @@ lint: vendor | $(PKGS) $(GOLINT) # ❷
 	    test -z "$$($(GOLINT) $$pkg | tee /dev/stderr)" || ret=1 ; \
 	done ; exit $$ret
 
+unit-test: 
+	CGO_ENABLED=$(CGO_ENABLED) $(GO) test $(PACKAGE_DIRS) -test.v --run UnitTest --cover
diff --git a/main.go b/main.go
@@ -92,7 +92,7 @@ func HelloServer(w http.ResponseWriter, req *http.Request) {
 		delayNum, _ := strconv.Atoi(delay)
 		sleep(time.Duration(delayNum) * time.Millisecond)
 	}
-	io.WriteString(w, "hello, world!\n")
+	io.WriteString(w, "hello, PR!\n")
 }
 
 func RandomErrorServer(w http.ResponseWriter, req *http.Request) {

diff --git a/main_test.go b/main_test.go
@@ -88,7 +88,7 @@ func (s *MainTestSuite) Test_HelloServer_WritesHelloWorld() {
 
 	HelloServer(w, req)
 
-	w.AssertCalled(s.T(), "Write", []byte("hello, world!\n"))
+	w.AssertCalled(s.T(), "Write", []byte("hello, PR!\n"))
 }
 
 func (s *MainTestSuite) Test_HelloServer_Waits_WhenDelayIsPresent() {