From e4bb3979b83237b0f27a322d7062cec879c25297 Mon Sep 17 00:00:00 2001 From: Dominic Breuker Date: Fri, 9 Mar 2018 08:59:34 +0100 Subject: [PATCH] fix stupid mistake --- docker/Dockerfile.testing | 4 +++- docker/entrypoint-testing.sh | 5 ----- internal/fswatcher/inotify/testdata/folder/.keep | 0 3 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 internal/fswatcher/inotify/testdata/folder/.keep diff --git a/docker/Dockerfile.testing b/docker/Dockerfile.testing index 7067381..9748c29 100644 --- a/docker/Dockerfile.testing +++ b/docker/Dockerfile.testing @@ -9,8 +9,10 @@ COPY cmd /go/src/github.com/dominicbreuker/pspy/cmd COPY internal /go/src/github.com/dominicbreuker/pspy/internal COPY vendor /go/src/github.com/dominicbreuker/pspy/vendor -# build executable +# run tests WORKDIR /go/src/github.com/dominicbreuker/pspy +RUN go test ./... +# build executable RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -ldflags '-extldflags "-static"' -o bin/pspy main.go ### Prepare integration test ### diff --git a/docker/entrypoint-testing.sh b/docker/entrypoint-testing.sh index 2776027..30a8508 100644 --- a/docker/entrypoint-testing.sh +++ b/docker/entrypoint-testing.sh @@ -1,10 +1,5 @@ #!/bin/bash -# run unit tests -echo "[+] running unit tests" -sudo /bin/sh -c 'GOPATH=/go /usr/local/go/bin/go test ./...' - -# run integration test sudo cron -f & sleep 1 sudo ps | grep cron 1>/dev/null diff --git a/internal/fswatcher/inotify/testdata/folder/.keep b/internal/fswatcher/inotify/testdata/folder/.keep new file mode 100644 index 0000000..e69de29