httpexec: fix broken unit test

mesos · Sep 18, 2017 · 5798ac9 · 5798ac9
1 parent a269128
commit 5798ac9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/api/v1/lib/httpcli/httpexec/gen.go b/api/v1/lib/httpcli/httpexec/gen.go
@@ -1,3 +1,3 @@
 package httpexec
 
-//go:generate go run ../../extras/gen/httpsender.go ../../extras/gen/gen.go -import github.com/mesos/mesos-go/api/v1/lib/executor -import github.com/mesos/mesos-go/api/v1/lib/executor/calls -type C:executor.Call:executor.Call{Type:agent.Call_MESSAGE}
+//go:generate go run ../../extras/gen/httpsender.go ../../extras/gen/gen.go -import github.com/mesos/mesos-go/api/v1/lib/executor -import github.com/mesos/mesos-go/api/v1/lib/executor/calls -type C:executor.Call:executor.Call{Type:executor.Call_MESSAGE}
diff --git a/api/v1/lib/httpcli/httpexec/httpexec_generated.go b/api/v1/lib/httpcli/httpexec/httpexec_generated.go
@@ -1,6 +1,6 @@
 package httpexec
 
-// go generate -import github.com/mesos/mesos-go/api/v1/lib/executor -import github.com/mesos/mesos-go/api/v1/lib/executor/calls -type C:executor.Call:executor.Call{Type:agent.Call_MESSAGE}
+// go generate -import github.com/mesos/mesos-go/api/v1/lib/executor -import github.com/mesos/mesos-go/api/v1/lib/executor/calls -type C:executor.Call:executor.Call{Type:executor.Call_MESSAGE}
 // GENERATED CODE FOLLOWS; DO NOT EDIT.
 
 import (

diff --git a/api/v1/lib/httpcli/httpexec/httpexec_generated_test.go b/api/v1/lib/httpcli/httpexec/httpexec_generated_test.go
@@ -1,6 +1,6 @@
 package httpexec
 
-// go generate -import github.com/mesos/mesos-go/api/v1/lib/executor -import github.com/mesos/mesos-go/api/v1/lib/executor/calls -type C:executor.Call:executor.Call{Type:agent.Call_MESSAGE}
+// go generate -import github.com/mesos/mesos-go/api/v1/lib/executor -import github.com/mesos/mesos-go/api/v1/lib/executor/calls -type C:executor.Call:executor.Call{Type:executor.Call_MESSAGE}
 // GENERATED CODE FOLLOWS; DO NOT EDIT.
 
 import (
@@ -36,7 +36,7 @@ func TestNewSender(t *testing.T) {
 		return nil
 	}
 	sender := NewSender(cf)
-	c := &executor.Call{Type:agent.Call_MESSAGE}
+	c := &executor.Call{Type:executor.Call_MESSAGE}
 
 	check(sender.Send(context.Background(), calls.NonStreaming(c)))
 	r := sent()

diff --git a/api/v1/lib/httpcli/httpexec/util.go b/api/v1/lib/httpcli/httpexec/util.go
@@ -3,8 +3,15 @@ package httpexec
 import (
 	"github.com/mesos/mesos-go/api/v1/lib/client"
 	"github.com/mesos/mesos-go/api/v1/lib/executor"
+	"github.com/mesos/mesos-go/api/v1/lib/httpcli"
 )
 
-func classifyResponse(c *executor.Call) (client.ResponseClass, error) {
-	return client.ResponseClassAuto, nil // TODO(jdef) fix this, ResponseClassAuto is deprecated
+func classifyResponse(c *executor.Call) (rc client.ResponseClass, err error) {
+	switch name := executor.Call_Type_name[int32(c.GetType())]; name {
+	case "", "UNKNOWN":
+		err = httpcli.ProtocolError("unsupported call type")
+	default:
+		rc = client.ResponseClassAuto // TODO(jdef) fix this, ResponseClassAuto is deprecated
+	}
+	return
 }