Merge pull request #1562 from carlisia/c-bug-sort

Fix test comparison

pkg/serverstatusrequest/process_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package serverstatusrequest
 
 import (
+	"sort"
 	"testing"
 	"time"
 
@@ -164,6 +165,9 @@ func TestProcess(t *testing.T) {
 				assert.Nil(t, res)
 				assert.True(t, apierrors.IsNotFound(err))
 			} else {
+				sortPluginsByKindAndName(tc.expected.Status.Plugins)
+				sortPluginsByKindAndName(res.Status.Plugins)
+				assert.Equal(t, tc.expected.Status.Plugins, res.Status.Plugins)
 				assert.Equal(t, tc.expected, res)
 				assert.Nil(t, err)
 			}
@@ -171,6 +175,15 @@ func TestProcess(t *testing.T) {
 	}
 }
 
+func sortPluginsByKindAndName(plugins []velerov1api.PluginInfo) {
+	sort.Slice(plugins, func(i, j int) bool {
+		if plugins[i].Kind != plugins[j].Kind {
+			return plugins[i].Kind < plugins[j].Kind
+		}
+		return plugins[i].Name < plugins[j].Name
+	})
+}
+
 type fakePluginLister struct {
 	plugins []framework.PluginIdentifier
 }