Merge branch v2.11 into v3.4
This commit is contained in:
commit
bd4bfd8919
110 changed files with 493 additions and 494 deletions
|
|
@ -1,7 +1,6 @@
|
|||
package plugins
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"os"
|
||||
|
|
@ -21,7 +20,7 @@ func TestSettingsWithoutSocket(t *testing.T) {
|
|||
|
||||
zerolog.SetGlobalLevel(zerolog.DebugLevel)
|
||||
|
||||
ctx := log.Logger.WithContext(context.Background())
|
||||
ctx := log.Logger.WithContext(t.Context())
|
||||
|
||||
t.Setenv("PLUGIN_TEST", "MY-TEST")
|
||||
t.Setenv("PLUGIN_TEST_B", "MY-TEST_B")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue