mirror of
https://github.com/buger/goreplay.git
synced 2024-04-21 12:32:02 +00:00
Merge branch 'master' of https://github.com/buger/gor
This commit is contained in:
+7
-2
@@ -4,7 +4,6 @@ import (
|
||||
"bytes"
|
||||
"crypto/rand"
|
||||
"encoding/hex"
|
||||
"github.com/buger/goreplay/proto"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
@@ -12,6 +11,8 @@ import (
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/buger/goreplay/proto"
|
||||
)
|
||||
|
||||
type fakeServiceCb func(string, int, []byte)
|
||||
@@ -117,7 +118,7 @@ func TestEchoMiddleware(t *testing.T) {
|
||||
|
||||
// Catch traffic from one service
|
||||
fromAddr := strings.Replace(from.Listener.Addr().String(), "[::]", "127.0.0.1", -1)
|
||||
input := NewRAWInput(fromAddr, EnginePcap, true, testRawExpire, "", "http")
|
||||
input := NewRAWInput(fromAddr, EnginePcap, true, testRawExpire, "", "http", "")
|
||||
defer input.Close()
|
||||
|
||||
// And redirect to another
|
||||
@@ -179,7 +180,11 @@ func TestTokenMiddleware(t *testing.T) {
|
||||
|
||||
fromAddr := strings.Replace(from.Listener.Addr().String(), "[::]", "127.0.0.1", -1)
|
||||
// Catch traffic from one service
|
||||
<<<<<<< HEAD
|
||||
input := NewRAWInput(fromAddr, EnginePcap, true, testRawExpire, "", "http")
|
||||
=======
|
||||
input := NewRAWInput(fromAddr, EnginePcap, true, testRawExpire, "", "")
|
||||
>>>>>>> d309650589a56db2bfa93c533337e3db1cfb0425
|
||||
defer input.Close()
|
||||
|
||||
// And redirect to another
|
||||
|
||||
Reference in New Issue
Block a user