Merge pull request #1205 from jskelcy/js/fix_tests

vmihailenco · web-flow · commit 9d85e760bf16 · 2019-12-07T11:35:06.000+02:00
properly point redisServerConf to redis.conf
diff --git a/main_test.go b/main_test.go
@@ -257,7 +257,7 @@ func (p *redisProcess) Close() error {
 
 var (
 	redisServerBin, _  = filepath.Abs(filepath.Join("testdata", "redis", "src", "redis-server"))
-	redisServerConf, _ = filepath.Abs(filepath.Join("testdata", "redis.conf"))
+	redisServerConf, _ = filepath.Abs(filepath.Join("testdata", "redis", "redis.conf"))
 )
 
 func redisDir(port string) (string, error) {

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ func (p *redisProcess) Close() error {`
`257`	`257`
`258`	`258`	`var (`
`259`	`259`	`redisServerBin, _ = filepath.Abs(filepath.Join("testdata", "redis", "src", "redis-server"))`
`260`		`- redisServerConf, _ = filepath.Abs(filepath.Join("testdata", "redis.conf"))`
	`260`	`+ redisServerConf, _ = filepath.Abs(filepath.Join("testdata", "redis", "redis.conf"))`
`261`	`261`	`)`
`262`	`262`
`263`	`263`	`func redisDir(port string) (string, error) {`