diff --git a/backend/factory.go b/backend/factory.go index 5021b80..3625ab0 100644 --- a/backend/factory.go +++ b/backend/factory.go @@ -25,7 +25,7 @@ func Register(key string, backend QuicBackend) { func Get(key string) (QuicBackend, bool) { val, ok := bcRegister[key] if !ok { - return bcRegister[bcDefaultBackend], true + return bcRegister[bcDefaultBackend], false } return val, ok } diff --git a/service/service_test.go b/service/service_test.go index 1db1f05..7f16c28 100644 --- a/service/service_test.go +++ b/service/service_test.go @@ -5,12 +5,12 @@ package service import ( "context" "github.com/Project-Faster/monkey" - service "github.com/parvit/kardianos-service" "github.com/Project-Faster/qpep/api" "github.com/Project-Faster/qpep/shared/configuration" "github.com/Project-Faster/qpep/workers/client" "github.com/Project-Faster/qpep/workers/gateway" "github.com/Project-Faster/qpep/workers/server" + service "github.com/parvit/kardianos-service" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "os" @@ -43,6 +43,11 @@ func (s *ServiceSuite) AfterTest(_, _ string) { func (s *ServiceSuite) BeforeTest(_, _ string) { configuration.QPepConfig = configuration.QPepConfigType{} configuration.QPepConfig.Merge(&configuration.DefaultConfig) + + // this to stop requiring admin rights to start tests + configuration.QPepConfig.General.APIPort = 9443 + configuration.QPepConfig.Client.LocalListenPort = 9444 + configuration.QPepConfig.Server.LocalListenPort = 9444 } func (s *ServiceSuite) TestServiceMain_Server() { diff --git a/windivert/windivert_other_test.go b/windivert/windivert_other_test.go index ac25fe5..2bf05a6 100644 --- a/windivert/windivert_other_test.go +++ b/windivert/windivert_other_test.go @@ -30,7 +30,7 @@ func (s *WinDivertSuite) TestInitializeWinDivertEngine() { code := InitializeWinDivertEngine( addr, addr, - configuration.QPepConfig.GatewayAPIPort, 445, + configuration.QPepConfig.General.APIPort, 445, 4, 0) assert.Equal(t, DIVERT_OK, code) @@ -56,7 +56,7 @@ func (s *WinDivertSuite) TestCloseWinDivertEngine() { code := InitializeWinDivertEngine( addr, addr, - configuration.QPepConfig.GatewayAPIPort, 445, + configuration.QPepConfig.General.APIPort, 445, 4, 0) assert.Equal(t, DIVERT_OK, code) diff --git a/windivert/windivert_windows_test.go b/windivert/windivert_windows_test.go index 7261d1e..84ea368 100644 --- a/windivert/windivert_windows_test.go +++ b/windivert/windivert_windows_test.go @@ -50,9 +50,9 @@ func (s *WinDivertSuite) BeforeTest(_, _ string) { } flags.Globals.Client = false - configuration.QPepConfig.Verbose = true - configuration.QPepConfig.ListenHost = "127.0.0.1" - configuration.QPepConfig.GatewayAPIPort = 9443 + configuration.QPepConfig.General.Verbose = true + configuration.QPepConfig.Client.LocalListeningAddress = "127.0.0.1" + configuration.QPepConfig.General.APIPort = 9443 s.finished = false s.ctx, s.cancel = context.WithCancel(context.Background()) @@ -76,7 +76,7 @@ func (s *WinDivertSuite) TestInitializeWinDivertEngine() { code := InitializeWinDivertEngine( addr, addr, - configuration.QPepConfig.GatewayAPIPort, 445, + configuration.QPepConfig.General.APIPort, 445, 4, itFaces[0]) assert.Equal(t, DIVERT_OK, code) @@ -102,7 +102,7 @@ func (s *WinDivertSuite) TestCloseWinDivertEngine() { code := InitializeWinDivertEngine( addr, addr, - configuration.QPepConfig.GatewayAPIPort, 445, + configuration.QPepConfig.General.APIPort, 445, 4, itFaces[0]) assert.Equal(t, DIVERT_OK, code) diff --git a/workers/client/client_proxy_test.go b/workers/client/client_proxy_test.go index 2fd3bd7..1f45ceb 100644 --- a/workers/client/client_proxy_test.go +++ b/workers/client/client_proxy_test.go @@ -119,13 +119,13 @@ type fakeListener struct { } func (l *fakeListener) AcceptTCP() (*net.TCPConn, error) { - return nil, shared.ErrFailed + return nil, errors.ErrFailed } var _ net.Listener = &fakeListener{} func (l *fakeListener) Accept() (net.Conn, error) { - return nil, shared.ErrFailed + return nil, errors.ErrFailed } func (l *fakeListener) Addr() net.Addr { return nil