Merge 6376f08 into 3c8ea30

mesos · Jun 24, 2017 · cead4b1 · cead4b1
2 parents 3c8ea30 + 6376f08
commit cead4b1
Show file tree

Hide file tree

Showing 12 changed files with 16,635 additions and 4,441 deletions.
diff --git a/api/v1/cmd/example-scheduler/app/state.go b/api/v1/cmd/example-scheduler/app/state.go
@@ -29,6 +29,7 @@ func prepareExecutorInfo(
 	if execImage != "" {
 		// Create mesos custom executor
 		return &mesos.ExecutorInfo{
+			Type:       mesos.ExecutorInfo_CUSTOM,
 			ExecutorID: mesos.ExecutorID{Value: "default"},
 			Name:       proto.String("Test Executor"),
 			Command: mesos.CommandInfo{
@@ -73,6 +74,7 @@ func prepareExecutorInfo(
 
 		// Create mesos custom executor
 		return &mesos.ExecutorInfo{
+			Type:       mesos.ExecutorInfo_CUSTOM,
 			ExecutorID: mesos.ExecutorID{Value: "default"},
 			Name:       proto.String("Test Executor"),
 			Command: mesos.CommandInfo{

diff --git a/api/v1/lib/httpcli/httpsched/state_test.go b/api/v1/lib/httpcli/httpsched/state_test.go
@@ -28,7 +28,7 @@ func TestDisconnectionDecoder(t *testing.T) {
 	// ERROR event triggers disconnect
 	latch.Reset()
 	errtype := scheduler.Event_ERROR
-	event := &scheduler.Event{Type: &errtype}
+	event := &scheduler.Event{Type: errtype}
 	decoder = encoding.DecoderFunc(func(um encoding.Unmarshaler) error { return nil })
 	d = disconnectionDecoder(decoder, latch.Close)
 	_ = d.Decode(event)
@@ -39,6 +39,7 @@ func TestDisconnectionDecoder(t *testing.T) {
 	// sanity: non-ERROR event does not trigger disconnect
 	latch.Reset()
 	errtype = scheduler.Event_SUBSCRIBED
+	event = &scheduler.Event{Type: errtype}
 	_ = d.Decode(event)
 	if latch.Closed() {
 		t.Error("disconnect func was unexpectedly called")