Add support for CI jobs

Ad ci directory containing a Dockerfile where unit tests shall be
executed.

Change-Id: Ica50888d24b7cdd4326a632a408619ed17be08c0
Signed-off-by: Marco Tallskog <marco.tallskog@nokia.com>

diff --git a/ci/Dockerfile b/ci/Dockerfile
new file mode 100644 (file)
index 0000000..5d259c4
--- /dev/null
+++ b/ci/Dockerfile
@@ -0,0 +1,25 @@
+#
+#  Copyright (c) 2019 AT&T Intellectual Property.
+#  Copyright (c) 2018-2019 Nokia.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+#
+# This is a Dockerfile for code verification only.
+# Not to be pushed or used for anything else.
+#
+FROM golang:1.12
+
+RUN mkdir -p $GOPATH/src/sdlgo
+COPY . $GOPATH/src/sdlgo
+RUN cd $GOPATH/src/sdlgo && ci/ci_test.sh

diff --git a/ci/ci_test.sh b/ci/ci_test.sh
new file mode 100755 (executable)
index 0000000..88273db
--- /dev/null
+++ b/ci/ci_test.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+#  Copyright (c) 2019 AT&T Intellectual Property.
+#  Copyright (c) 2018-2019 Nokia.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+set -e
+
+export GO111MODULE=on
+go mod download
+go test ./... --run Test*

diff --git a/internal/sdlgoredis/sdlgoredis.go b/internal/sdlgoredis/sdlgoredis.go
index 8e2a2ef..679a24a 100644 (file)
--- a/internal/sdlgoredis/sdlgoredis.go
+++ b/internal/sdlgoredis/sdlgoredis.go
@@ -92,7 +92,7 @@ func checkIntResultAndError(result interface{}, err error) (bool, error) {
        if err != nil {
                return false, err
        }
-       if result.(int64) == int64(1) {
+       if result.(int) == int(1) {
                return true, nil
        }
        return false, nil

diff --git a/sdl.go b/sdl.go
index f2cdacb..3126542 100644 (file)
--- a/sdl.go
+++ b/sdl.go
@@ -430,7 +430,7 @@ func (s *SdlInstance) RemoveAllAndPublish(channelsAndEvents []string) error {
                if len(channelsAndEvents) == 0 {
                        return s.Del(keys)
                }
-               if err := s.checkChannelsAndEvents("RemoveIfAndPublish", channelsAndEvents); err != nil {
+               if err := s.checkChannelsAndEvents("RemoveAllAndPublish", channelsAndEvents); err != nil {
                        return err
                }
                channelsAndEventsPrepared := s.prepareChannelsAndEvents(channelsAndEvents)