From bba9f5e673a7886926086cac94af9e1e20972a72 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Sat, 6 Apr 2019 11:04:42 -0400 Subject: [PATCH] Fixup gonum.org/v1/gonum/graph API calls --- pkg/controller/garbagecollector/dump.go | 2 +- pkg/controller/garbagecollector/dump_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/controller/garbagecollector/dump.go b/pkg/controller/garbagecollector/dump.go index a9ea97283ff..456877f1271 100644 --- a/pkg/controller/garbagecollector/dump.go +++ b/pkg/controller/garbagecollector/dump.go @@ -268,7 +268,7 @@ func (h *debugHTTPHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { graph = h.controller.dependencyGraphBuilder.uidToNode.ToGonumGraph() } - data, err := dot.Marshal(graph, "full", "", " ", false) + data, err := dot.Marshal(graph, "full", "", " ") if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return diff --git a/pkg/controller/garbagecollector/dump_test.go b/pkg/controller/garbagecollector/dump_test.go index fae9b533d29..f3bd43f672d 100644 --- a/pkg/controller/garbagecollector/dump_test.go +++ b/pkg/controller/garbagecollector/dump_test.go @@ -439,8 +439,8 @@ func TestToGonumGraphObj(t *testing.T) { func compareGraphs(expected, actual graph.Directed, t *testing.T) { // sort the edges by from ID, then to ID // (the slices we get back are from map iteration, where order is not guaranteed) - expectedNodes := expected.Nodes() - actualNodes := actual.Nodes() + expectedNodes := expected.Nodes().(graph.NodeSlicer).NodeSlice() + actualNodes := actual.Nodes().(graph.NodeSlicer).NodeSlice() sort.Sort(gonumByUID(expectedNodes)) sort.Sort(gonumByUID(actualNodes)) @@ -455,8 +455,8 @@ func compareGraphs(expected, actual graph.Directed, t *testing.T) { t.Errorf("expected %v, got %v", spew.Sdump(currExpected), spew.Sdump(currActual)) } - expectedFrom := append([]graph.Node{}, expected.From(expectedNodes[i].ID())...) - actualFrom := append([]graph.Node{}, actual.From(actualNodes[i].ID())...) + expectedFrom := append([]graph.Node{}, expected.From(expectedNodes[i].ID()).(graph.NodeSlicer).NodeSlice()...) + actualFrom := append([]graph.Node{}, actual.From(actualNodes[i].ID()).(graph.NodeSlicer).NodeSlice()...) sort.Sort(gonumByUID(expectedFrom)) sort.Sort(gonumByUID(actualFrom)) if len(expectedFrom) != len(actualFrom) {