From 966222ac0f1559ebfec0037dd075e33decb13287 Mon Sep 17 00:00:00 2001 From: Carlisia Date: Thu, 29 Aug 2019 17:55:13 -0700 Subject: [PATCH] Sort mounts in test case to avoid intermitent fail Closes #1826. Signed-off-by: Carlisia --- pkg/restore/restic_restore_action_test.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkg/restore/restic_restore_action_test.go b/pkg/restore/restic_restore_action_test.go index 938ef58e3..71579b20e 100644 --- a/pkg/restore/restic_restore_action_test.go +++ b/pkg/restore/restic_restore_action_test.go @@ -18,6 +18,7 @@ package restore import ( "fmt" + "sort" "testing" "github.com/sirupsen/logrus" @@ -213,10 +214,21 @@ func TestResticRestoreActionExecute(t *testing.T) { res, err := a.Execute(input) assert.NoError(t, err) - wantUnstructured, err := runtime.DefaultUnstructuredConverter.ToUnstructured(tc.want) - require.NoError(t, err) + updatedPod := new(corev1api.Pod) + require.NoError(t, runtime.DefaultUnstructuredConverter.FromUnstructured(res.UpdatedItem.UnstructuredContent(), updatedPod)) - assert.Equal(t, &unstructured.Unstructured{Object: wantUnstructured}, res.UpdatedItem) + for _, container := range tc.want.Spec.InitContainers { + sort.Slice(container.VolumeMounts, func(i, j int) bool { + return container.VolumeMounts[i].Name < container.VolumeMounts[j].Name + }) + } + for _, container := range updatedPod.Spec.InitContainers { + sort.Slice(container.VolumeMounts, func(i, j int) bool { + return container.VolumeMounts[i].Name < container.VolumeMounts[j].Name + }) + } + + assert.Equal(t, tc.want, updatedPod) }) }