From f9ba969464d9caf152656d06af44f4918df5ed88 Mon Sep 17 00:00:00 2001 From: Umputun Date: Sat, 14 Jul 2018 13:42:00 -0500 Subject: [PATCH] another attempt to fix unexpected mongo tests --- backend/app/store/engine/mongo/server_test.go | 9 +++------ backend/app/store/engine/mongo/testing.go | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/backend/app/store/engine/mongo/server_test.go b/backend/app/store/engine/mongo/server_test.go index 466db5d6..1b83548a 100644 --- a/backend/app/store/engine/mongo/server_test.go +++ b/backend/app/store/engine/mongo/server_test.go @@ -1,7 +1,6 @@ package mongo import ( - "log" "os" "testing" "time" @@ -12,13 +11,11 @@ import ( func TestServer_NewServerGood(t *testing.T) { mongoURL := os.Getenv("MONGO_REMARK_TEST") - if mongoURL == "" { - mongoURL = "mongodb://mongo:27017/test?debug=true" - log.Printf("[WARN] no MONGO_REMARK_TEST in env") - } - if mongoURL == "skip" { + if mongoURL == "" || mongoURL == "skip" { + t.Skip("no MONGO_REMARK_TEST in env") return } + m, err := NewServerWithURL(mongoURL, 3*time.Second) assert.Nil(t, err) assert.NotNil(t, m) diff --git a/backend/app/store/engine/mongo/testing.go b/backend/app/store/engine/mongo/testing.go index d013f850..1c743913 100644 --- a/backend/app/store/engine/mongo/testing.go +++ b/backend/app/store/engine/mongo/testing.go @@ -22,11 +22,11 @@ var once sync.Once func MakeTestConnection(t *testing.T) (*Connection, error) { mongoURL := os.Getenv("MONGO_REMARK_TEST") if mongoURL == "" { - mongoURL = "mongodb://mongo:27017" - log.Printf("[WARN] no MONGO_REMARK_TEST in env") + t.Skip("no MONGO_REMARK_TEST in env") + return nil, errors.New("skip") } if mongoURL == "skip" { - log.Print("skip mongo test") + t.Skip("skip mongo test") return nil, errors.New("skip") }