From 8526c03822e724bc2ebb64b6197085fea335b782 Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Fri, 25 Dec 2020 14:46:01 +0300 Subject: Move root plugins to the pkg --- tests/plugins/http/attributes_test.go | 2 +- tests/plugins/http/handler_test.go | 2 +- tests/plugins/http/http_test.go | 8 ++++---- tests/plugins/http/parse_test.go | 2 +- tests/plugins/http/response_test.go | 2 +- tests/plugins/http/uploads_config_test.go | 2 +- tests/plugins/http/uploads_test.go | 2 +- tests/plugins/informer/informer_test.go | 4 ++-- tests/plugins/informer/test_plugin.go | 2 +- tests/plugins/server/plugin_pipes.go | 2 +- tests/plugins/server/plugin_sockets.go | 2 +- tests/plugins/server/plugin_tcp.go | 2 +- tests/plugins/server/server_test.go | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) (limited to 'tests/plugins') diff --git a/tests/plugins/http/attributes_test.go b/tests/plugins/http/attributes_test.go index 69200a30..54998906 100644 --- a/tests/plugins/http/attributes_test.go +++ b/tests/plugins/http/attributes_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "github.com/spiral/roadrunner/v2/plugins/http/attributes" + "github.com/spiral/roadrunner/v2/pkg/plugins/http/attributes" "github.com/stretchr/testify/assert" ) diff --git a/tests/plugins/http/handler_test.go b/tests/plugins/http/handler_test.go index 18558296..193bf0cf 100644 --- a/tests/plugins/http/handler_test.go +++ b/tests/plugins/http/handler_test.go @@ -11,8 +11,8 @@ import ( "strings" "github.com/spiral/roadrunner/v2/pkg/pipe" + httpPlugin "github.com/spiral/roadrunner/v2/pkg/plugins/http" poolImpl "github.com/spiral/roadrunner/v2/pkg/pool" - httpPlugin "github.com/spiral/roadrunner/v2/plugins/http" "github.com/stretchr/testify/assert" "net/http" diff --git a/tests/plugins/http/http_test.go b/tests/plugins/http/http_test.go index 9c081bc5..f4a357f2 100644 --- a/tests/plugins/http/http_test.go +++ b/tests/plugins/http/http_test.go @@ -23,14 +23,14 @@ import ( "github.com/spiral/roadrunner-plugins/logger" "github.com/spiral/roadrunner-plugins/resetter" "github.com/spiral/roadrunner/v2/interfaces/events" - "github.com/spiral/roadrunner/v2/mocks" - "github.com/spiral/roadrunner/v2/plugins/informer" - "github.com/spiral/roadrunner/v2/plugins/server" + "github.com/spiral/roadrunner/v2/pkg/plugins/informer" + "github.com/spiral/roadrunner/v2/pkg/plugins/server" + "github.com/spiral/roadrunner/v2/tests/mocks" "github.com/spiral/roadrunner/v2/tools" "github.com/yookoala/gofast" rpcPlugin "github.com/spiral/roadrunner-plugins/rpc" - httpPlugin "github.com/spiral/roadrunner/v2/plugins/http" + httpPlugin "github.com/spiral/roadrunner/v2/pkg/plugins/http" "github.com/stretchr/testify/assert" ) diff --git a/tests/plugins/http/parse_test.go b/tests/plugins/http/parse_test.go index 5cc1ce32..df217202 100644 --- a/tests/plugins/http/parse_test.go +++ b/tests/plugins/http/parse_test.go @@ -3,7 +3,7 @@ package http import ( "testing" - "github.com/spiral/roadrunner/v2/plugins/http" + "github.com/spiral/roadrunner/v2/pkg/plugins/http" ) var samples = []struct { diff --git a/tests/plugins/http/response_test.go b/tests/plugins/http/response_test.go index a9cbf91a..229163a2 100644 --- a/tests/plugins/http/response_test.go +++ b/tests/plugins/http/response_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/spiral/roadrunner/v2/pkg/payload" - httpPlugin "github.com/spiral/roadrunner/v2/plugins/http" + httpPlugin "github.com/spiral/roadrunner/v2/pkg/plugins/http" "github.com/stretchr/testify/assert" ) diff --git a/tests/plugins/http/uploads_config_test.go b/tests/plugins/http/uploads_config_test.go index e76078ee..4a7927c5 100644 --- a/tests/plugins/http/uploads_config_test.go +++ b/tests/plugins/http/uploads_config_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - httpPlugin "github.com/spiral/roadrunner/v2/plugins/http" + httpPlugin "github.com/spiral/roadrunner/v2/pkg/plugins/http" "github.com/stretchr/testify/assert" ) diff --git a/tests/plugins/http/uploads_test.go b/tests/plugins/http/uploads_test.go index 7bb25cbf..e71ff8c1 100644 --- a/tests/plugins/http/uploads_test.go +++ b/tests/plugins/http/uploads_test.go @@ -17,8 +17,8 @@ import ( j "github.com/json-iterator/go" "github.com/spiral/roadrunner/v2/pkg/pipe" + httpPlugin "github.com/spiral/roadrunner/v2/pkg/plugins/http" poolImpl "github.com/spiral/roadrunner/v2/pkg/pool" - httpPlugin "github.com/spiral/roadrunner/v2/plugins/http" "github.com/stretchr/testify/assert" ) diff --git a/tests/plugins/informer/informer_test.go b/tests/plugins/informer/informer_test.go index 97f27671..15063d7e 100644 --- a/tests/plugins/informer/informer_test.go +++ b/tests/plugins/informer/informer_test.go @@ -14,8 +14,8 @@ import ( "github.com/spiral/roadrunner-plugins/config" "github.com/spiral/roadrunner-plugins/logger" rpcPlugin "github.com/spiral/roadrunner-plugins/rpc" - "github.com/spiral/roadrunner/v2/plugins/informer" - "github.com/spiral/roadrunner/v2/plugins/server" + "github.com/spiral/roadrunner/v2/pkg/plugins/informer" + "github.com/spiral/roadrunner/v2/pkg/plugins/server" "github.com/spiral/roadrunner/v2/tools" "github.com/stretchr/testify/assert" ) diff --git a/tests/plugins/informer/test_plugin.go b/tests/plugins/informer/test_plugin.go index ab3b2286..95adfb07 100644 --- a/tests/plugins/informer/test_plugin.go +++ b/tests/plugins/informer/test_plugin.go @@ -6,8 +6,8 @@ import ( "github.com/spiral/roadrunner-plugins/config" "github.com/spiral/roadrunner/v2/interfaces/worker" + "github.com/spiral/roadrunner/v2/pkg/plugins/server" poolImpl "github.com/spiral/roadrunner/v2/pkg/pool" - "github.com/spiral/roadrunner/v2/plugins/server" ) var testPoolConfig = poolImpl.Config{ diff --git a/tests/plugins/server/plugin_pipes.go b/tests/plugins/server/plugin_pipes.go index afed695f..6f31395a 100644 --- a/tests/plugins/server/plugin_pipes.go +++ b/tests/plugins/server/plugin_pipes.go @@ -8,9 +8,9 @@ import ( "github.com/spiral/roadrunner-plugins/config" "github.com/spiral/roadrunner/v2/interfaces/pool" "github.com/spiral/roadrunner/v2/pkg/payload" + "github.com/spiral/roadrunner/v2/pkg/plugins/server" poolImpl "github.com/spiral/roadrunner/v2/pkg/pool" "github.com/spiral/roadrunner/v2/pkg/worker" - "github.com/spiral/roadrunner/v2/plugins/server" ) const ConfigSection = "server" diff --git a/tests/plugins/server/plugin_sockets.go b/tests/plugins/server/plugin_sockets.go index f5f8f7ad..1820b4c1 100644 --- a/tests/plugins/server/plugin_sockets.go +++ b/tests/plugins/server/plugin_sockets.go @@ -7,8 +7,8 @@ import ( "github.com/spiral/roadrunner-plugins/config" "github.com/spiral/roadrunner/v2/interfaces/pool" "github.com/spiral/roadrunner/v2/pkg/payload" + "github.com/spiral/roadrunner/v2/pkg/plugins/server" "github.com/spiral/roadrunner/v2/pkg/worker" - "github.com/spiral/roadrunner/v2/plugins/server" ) type Foo2 struct { diff --git a/tests/plugins/server/plugin_tcp.go b/tests/plugins/server/plugin_tcp.go index 2f33659c..01fa0cf5 100644 --- a/tests/plugins/server/plugin_tcp.go +++ b/tests/plugins/server/plugin_tcp.go @@ -7,8 +7,8 @@ import ( "github.com/spiral/roadrunner-plugins/config" "github.com/spiral/roadrunner/v2/interfaces/pool" "github.com/spiral/roadrunner/v2/pkg/payload" + "github.com/spiral/roadrunner/v2/pkg/plugins/server" "github.com/spiral/roadrunner/v2/pkg/worker" - "github.com/spiral/roadrunner/v2/plugins/server" ) type Foo3 struct { diff --git a/tests/plugins/server/server_test.go b/tests/plugins/server/server_test.go index 5be25a20..75111ef7 100644 --- a/tests/plugins/server/server_test.go +++ b/tests/plugins/server/server_test.go @@ -9,7 +9,7 @@ import ( "github.com/spiral/endure" "github.com/spiral/roadrunner-plugins/config" "github.com/spiral/roadrunner-plugins/logger" - "github.com/spiral/roadrunner/v2/plugins/server" + "github.com/spiral/roadrunner/v2/pkg/plugins/server" "github.com/stretchr/testify/assert" ) -- cgit v1.2.3