Finish redis plugin

4 files changed, 167 insertions, 26 deletions

diff --git a/plugins/redis/tests/configs/.rr-redis.yaml b/plugins/redis/tests/configs/.rr-redis.yaml
deleted file mode 100644
index 52198a35..00000000
--- a/plugins/redis/tests/configs/.rr-redis.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-redis:
-  - cluster:
-      addr:
-        - 'localhost:6379'
-      db: 0
-      master: null
-      password: ''
-  - universal:
-      addr:
-        - 'localhost:6379'
-      db: 0
-      master: null
-      password: ''
-  - default:
-      addr:
-        - 'localhost:6379'
-      db: 0
-      master: null
-      password: ''
-  - sentinel:
-      addr:
-        - 'localhost:6379'
-      db: 0
-      master: null
-      password: ''
\ No newline at end of file
diff --git a/plugins/redis/tests/plugin1.go b/plugins/redis/tests/plugin1.go
new file mode 100644
index 00000000..e19ca90a
--- /dev/null
+++ b/plugins/redis/tests/plugin1.go
@@ -0,0 +1,43 @@
+package tests
+
+import (
+	"context"
+	"time"
+
+	"github.com/go-redis/redis/v8"
+	"github.com/spiral/errors"
+	redisPlugin "github.com/spiral/roadrunner/v2/interfaces/redis"
+)
+
+type Plugin1 struct {
+	redisClient redis.UniversalClient
+}
+
+func (p *Plugin1) Init(redis redisPlugin.Redis) error {
+	p.redisClient = redis.GetClient()
+	return nil
+}
+
+func (p *Plugin1) Serve() chan error {
+	const op = errors.Op("plugin1 serve")
+	errCh := make(chan error, 1)
+	p.redisClient.Set(context.Background(), "foo", "bar", time.Minute)
+
+	stringCmd := p.redisClient.Get(context.Background(), "foo")
+	data, err := stringCmd.Result()
+	if err != nil {
+		errCh <- errors.E(op, err)
+		return errCh
+	}
+
+	if data != "bar" {
+		errCh <- errors.E(op, errors.Str("no such key"))
+		return errCh
+	}
+
+	return errCh
+}
+
+func (p *Plugin1) Stop() error {
+	return p.redisClient.Close()
+}
diff --git a/plugins/redis/tests/redis_plugin_test.go b/plugins/redis/tests/redis_plugin_test.go
new file mode 100644
index 00000000..8f8da983
--- /dev/null
+++ b/plugins/redis/tests/redis_plugin_test.go
@@ -0,0 +1,124 @@
+package tests
+
+import (
+	"fmt"
+	"os"
+	"os/signal"
+	"sync"
+	"syscall"
+	"testing"
+	"time"
+
+	"github.com/alicebob/miniredis/v2"
+	"github.com/golang/mock/gomock"
+	"github.com/spiral/endure"
+	"github.com/spiral/roadrunner/v2/mocks"
+	"github.com/spiral/roadrunner/v2/plugins/config"
+	"github.com/spiral/roadrunner/v2/plugins/redis"
+	"github.com/stretchr/testify/assert"
+)
+
+func redisConfig(port string) string {
+	cfg := `
+redis:
+  addrs:
+    - 'localhost:%s'
+  master_name: ''
+  username: ''
+  password: ''
+  db: 0
+  sentinel_password: ''
+  route_by_latency: false
+  route_randomly: false
+  dial_timeout: 0
+  max_retries: 1
+  min_retry_backoff: 0
+  max_retry_backoff: 0
+  pool_size: 0
+  min_idle_conns: 0
+  max_conn_age: 0
+  read_timeout: 0
+  write_timeout: 0
+  pool_timeout: 0
+  idle_timeout: 0
+  idle_check_freq: 0
+  read_only: false
+`
+	return fmt.Sprintf(cfg, port)
+}
+
+func TestRedisInit(t *testing.T) {
+	cont, err := endure.NewContainer(nil, endure.SetLogLevel(endure.DebugLevel))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	s, err := miniredis.Run()
+	if err != nil {
+		panic(err)
+	}
+	defer s.Close()
+
+	c := redisConfig(s.Port())
+
+	cfg := &config.Viper{}
+	cfg.Prefix = "rr"
+	cfg.Path = ".rr-redis.yaml"
+	cfg.ReadInCfg = []byte(c)
+
+	controller := gomock.NewController(t)
+	mockLogger := mocks.NewMockLogger(controller)
+
+	err = cont.RegisterAll(
+		cfg,
+		mockLogger,
+		&redis.Plugin{},
+		&Plugin1{},
+	)
+	assert.NoError(t, err)
+
+	err = cont.Init()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	ch, err := cont.Serve()
+	assert.NoError(t, err)
+
+	sig := make(chan os.Signal, 1)
+	signal.Notify(sig, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
+
+	wg := &sync.WaitGroup{}
+	wg.Add(1)
+
+	tt := time.NewTimer(time.Second * 10)
+
+	go func() {
+		defer wg.Done()
+		for {
+			select {
+			case e := <-ch:
+				assert.Fail(t, "error", e.Error.Error())
+				err = cont.Stop()
+				if err != nil {
+					assert.FailNow(t, "error", err.Error())
+				}
+			case <-sig:
+				err = cont.Stop()
+				if err != nil {
+					assert.FailNow(t, "error", err.Error())
+				}
+				return
+			case <-tt.C:
+				// timeout
+				err = cont.Stop()
+				if err != nil {
+					assert.FailNow(t, "error", err.Error())
+				}
+				return
+			}
+		}
+	}()
+
+	wg.Wait()
+}
diff --git a/plugins/redis/tests/redis_plugin_tests.go b/plugins/redis/tests/redis_plugin_tests.go
deleted file mode 100644
index ca8701d2..00000000
--- a/plugins/redis/tests/redis_plugin_tests.go
+++ /dev/null
@@ -1 +0,0 @@
-package tests