From 1c8e8bb615b597b059e89d4da9213b0df73f7eca Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Fri, 18 Sep 2020 11:50:27 +0100 Subject: [PATCH] Fix proxy test The proxy test needed its own local resovler to pass. Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- pkg/proxy_test.go | 25 +++++++++++++++++++------ pkg/supervisor.go | 2 -- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/pkg/proxy_test.go b/pkg/proxy_test.go index e7f7b45..09b24a3 100644 --- a/pkg/proxy_test.go +++ b/pkg/proxy_test.go @@ -16,7 +16,7 @@ func Test_Proxy_ToPrivateServer(t *testing.T) { wantBodyText := "OK" wantBody := []byte(wantBodyText) - upstream := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + upstreamSvr := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.Body != nil { defer r.Body.Close() @@ -27,17 +27,19 @@ func Test_Proxy_ToPrivateServer(t *testing.T) { })) - defer upstream.Close() + defer upstreamSvr.Close() port := 8080 - proxy := NewProxy(port, time.Second*1) + u, _ := url.Parse(upstreamSvr.URL) + log.Println("Host", u.Host) + + upstreamAddr := u.Host + proxy := NewProxy(upstreamAddr, 8080, "127.0.0.1", time.Second*1, &mockResolver{}) gwChan := make(chan string, 1) doneCh := make(chan bool) - go proxy.Start(gwChan, doneCh) + go proxy.Start() - u, _ := url.Parse(upstream.URL) - log.Println("Host", u.Host) wg := sync.WaitGroup{} wg.Add(1) go func() { @@ -71,3 +73,14 @@ func Test_Proxy_ToPrivateServer(t *testing.T) { doneCh <- true }() } + +type mockResolver struct { +} + +func (m *mockResolver) Start() { + +} + +func (m *mockResolver) Get(upstream string, got chan<- string, timeout time.Duration) { + got <- upstream +} diff --git a/pkg/supervisor.go b/pkg/supervisor.go index 5a3971c..5977f3f 100644 --- a/pkg/supervisor.go +++ b/pkg/supervisor.go @@ -295,8 +295,6 @@ func ParseCompose(config *compose.Config) ([]Service, error) { }) } - fmt.Printf("Service: %s - %v\n", s.Name, s.Ports) - services[idx] = Service{ Name: s.Name, Image: s.Image,