Merge ce6a9b2 into 92e5dd9

moira-alert · Apr 8, 2020 · 1faecb0 · 1faecb0
2 parents 92e5dd9 + ce6a9b2
commit 1faecb0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/cmd/cli/user_test.go b/cmd/cli/user_test.go
@@ -23,7 +23,7 @@ func TestUpdateUsers(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	database := redis.NewDatabase(logger, conf.Redis.GetSettings(), redis.Cli)
+	database := redis.NewTestDatabase(logger)
 	conf.Cleanup.Whitelist = []string{"Nikolay", ""}
 
 	users := []string{"Aleksey", "Arkadiy", "Emil"}

diff --git a/database/redis/database.go b/database/redis/database.go
@@ -30,13 +30,17 @@ type DBSource string
 
 // All types of database instances users
 const (
-	API      DBSource = "API"
-	Checker  DBSource = "Checker"
-	Filter   DBSource = "Filter"
-	Notifier DBSource = "Notifier"
-	Cli      DBSource = "Cli"
+	API        DBSource = "API"
+	Checker    DBSource = "Checker"
+	Filter     DBSource = "Filter"
+	Notifier   DBSource = "Notifier"
+	Cli        DBSource = "Cli"
+	testSource DBSource = "test"
 )
 
+// Test data for configuration
+const testDB = 1
+
 // DbConnector contains redis pool
 type DbConnector struct {
 	pool                 *redis.Pool
@@ -108,6 +112,11 @@ func NewDatabase(logger moira.Logger, config Config, source DBSource) *DbConnect
 	return connector
 }
 
+// NewTestDatabase use it only for tests
+func NewTestDatabase(logger moira.Logger) *DbConnector {
+	return NewDatabase(logger, Config{Port: "6379", Host: "0.0.0.0", DB: testDB}, testSource)
+}
+
 // AllowStale returns a database instance, that prioritizes connections to slave nodes
 // Should only be used for read accesses when data actuality is not needed
 func (connector *DbConnector) AllowStale() moira.Database {

diff --git a/database/redis/database_test.go b/database/redis/database_test.go
@@ -11,10 +11,10 @@ import (
 
 var config = Config{Port: "6379", Host: "0.0.0.0"}
 var emptyConfig = Config{}
-var testSource = DBSource("test")
 
-// use it only for tests
+// use it only for tests in redis package
 func newTestDatabase(logger moira.Logger, config Config) *DbConnector {
+	config.DB = testDB
 	return NewDatabase(logger, config, testSource)
 }
 

diff --git a/integration_tests/notifier/notifier_test.go b/integration_tests/notifier/notifier_test.go
@@ -77,7 +77,7 @@ var event = moira.NotificationEvent{
 func TestNotifier(t *testing.T) {
 	mockCtrl = gomock.NewController(t)
 	defer mockCtrl.Finish()
-	database := redis.NewDatabase(logger, redis.Config{Port: "6379", Host: "localhost"}, redis.Notifier)
+	database := redis.NewTestDatabase(logger)
 	metricsSourceProvider := metricSource.CreateMetricSourceProvider(local.Create(database), nil)
 	database.SaveContact(&contact)
 	database.SaveSubscription(&subscription)