corrections for tests

Author: smgladkovskiy

.circleci/config.yml

@@ -11,7 +11,7 @@ jobs:
     environment: # environment variables for the build itself
       - IN_CONTAINER: true
       - DEP_VERSION: 0.5.0
-      - GOCACHE: "/tmp/go/cache"
+      - GOCACHE: /tmp/go/cache
       - TEST_RESULTS: /tmp/test-results # path to where test results will be saved
 
     steps:
@@ -35,8 +35,7 @@ jobs:
             ln -s ${CIRCLE_WORKING_DIRECTORY}/test/configuration/defaults/* /cfgs/defaults/
             ln -s ${CIRCLE_WORKING_DIRECTORY}/test/configuration/test/* /cfgs/test/
             make race
-            trap "go-junit-report <${TEST_RESULTS}/go-test.out > ${TEST_RESULTS}/go-test-report.xml" EXIT
-            make tests | tee ${TEST_RESULTS}/go-test.out
+            make coverage_cli | tee ${TEST_RESULTS}/go-test.out |  go-junit-report > ${TEST_RESULTS}/go-test-report.xml
 
       - store_artifacts: # Upload test summary for display in Artifacts: https://circleci.com/docs/2.0/artifacts/
           path: /tmp/test-results

.gitignore

@@ -1,3 +1,4 @@
 coverage.out
 .idea
-vendor
+vendor
+go-test*

Dockerfile

@@ -20,12 +20,14 @@ RUN apk update \
  && rm -rf /var/cache/apk/* \
  && rm -rf /tmp/*
 
-COPY . /go/src/gitlab.teamc.io/teamc.io/microservice/configuration/golang-pkg.git
-WORKDIR /go/src/gitlab.teamc.io/teamc.io/microservice/configuration/golang-pkg.git
+ARG SRC="/go/src/github.com/microparts/configuration-golang"
+
+COPY . ${SRC}
+WORKDIR ${SRC}
 
 RUN mkdir -p /cfgs/defaults \
- && mkdir -p /cfgs/test \
- && ln -s /go/src/gitlab.teamc.io/teamc.io/microservice/configuration/golang-pkg.git/test/configuration/defaults/* /cfgs/defaults/ \
- && ln -s /go/src/gitlab.teamc.io/teamc.io/microservice/configuration/golang-pkg.git/test/configuration/test/* /cfgs/test/
+ && mkdir -p /cfgs/development \
+ && ln -s ${SRC}/test/configuration/defaults/* /cfgs/defaults/ \
+ && ln -s ${SRC}/test/configuration/development/* /cfgs/development/
 
 RUN make deps

reader_test.go

@@ -3,19 +3,15 @@ package config
 import (
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/yaml.v2"
-	"os"
 	"testing"
 )
 
 func TestReadConfigs(t *testing.T) {
 	t.Run("Success parsing common dirs and files", func(t *testing.T) {
-		t.Parallel()
-		err := os.Setenv("STAGE", "test")
 		configBytes, err := ReadConfigs("./test/configuration")
 		if !assert.NoError(t, err) {
 			t.FailNow()
 		}
-		err = os.Unsetenv("STAGE")
 
 		type cfg struct {
 			Debug bool `yaml:"debug"`
@@ -46,13 +42,10 @@ func TestReadConfigs(t *testing.T) {
 		assert.EqualValues(t, refConfig, config)
 	})
 	t.Run("Success parsing complex dirs and files", func(t *testing.T) {
-		t.Parallel()
-		err := os.Setenv("STAGE", "test")
 		configBytes, err := ReadConfigs("./test/configuration2")
 		if !assert.NoError(t, err) {
 			t.FailNow()
 		}
-		err = os.Unsetenv("STAGE")
 
 		type hbParams struct {
 			AreaMapping map[string]string `yaml:"area_mapping"`
@@ -108,19 +101,14 @@ func TestReadConfigs(t *testing.T) {
 			}{Username: "R_USER", Password: "R_PASS"}}},
 		}
 
-		//log.Fatalf("DefaultList: %+v", config.DefaultList)
-
 		assert.EqualValues(t, refConfig, config)
 	})
 
 	t.Run("Success parsing symlinked files and dirs", func(t *testing.T) {
-		t.Parallel()
-		err := os.Setenv("STAGE", "test")
 		configBytes, err := ReadConfigs("./test/symnlinkedConfigs")
 		if !assert.NoError(t, err) {
 			t.FailNow()
 		}
-		err = os.Unsetenv("STAGE")
 
 		type cfg struct {
 			Debug bool `yaml:"debug"`
@@ -153,13 +141,10 @@ func TestReadConfigs(t *testing.T) {
 
 	if GetEnv("IN_CONTAINER", "") == "true" {
 		t.Run("Success parsing symlinked files and dirs in root", func(t *testing.T) {
-			t.Parallel()
-			err := os.Setenv("STAGE", "test")
 			configBytes, err := ReadConfigs("/cfgs")
 			if !assert.NoError(t, err) {
 				t.FailNow()
 			}
-			err = os.Unsetenv("STAGE")
 
 			type cfg struct {
 				Debug bool `yaml:"debug"`
@@ -192,7 +177,7 @@ func TestReadConfigs(t *testing.T) {
 	}
 
 	t.Run("Fail dir not found", func(t *testing.T) {
-		t.Parallel()
+
 		_, err := ReadConfigs("")
 		if !assert.Error(t, err) {
 			t.FailNow()

test/configuration/test/service.yaml renamed to test/configuration/development/service.yaml

@@ -1,2 +1,2 @@
-test:
+development:
   debug: true

test/configuration2/test/settings.yaml renamed to test/configuration2/development/settings.yaml

@@ -1,4 +1,4 @@
-test:
+development:
   hotelbook_params:
     url: https://hotelbook.com/xml_endpoint
     username: TESt_USERNAME

test/symnlinkedConfigs/test/data renamed to test/symnlinkedConfigs/development/data

@@ -0,0 +1 @@
+../../configuration/development/service.yaml