Tests robustness

Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>

cli/command/stack/kubernetes/services.go

@@ -2,6 +2,7 @@ package kubernetes
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 
 	"github.com/docker/cli/cli/command/formatter"
@@ -25,6 +26,8 @@ func generateValuedLabelsSelector(valuedLabels map[string][]string) []string {
 		if len(v) == 1 {
 			result = append(result, fmt.Sprintf("%s=%s", k, v[0]))
 		} else {
+			// make result more testable by sorting values
+			sort.Strings(v)
 			result = append(result, fmt.Sprintf("%s in (%s)", k, strings.Join(v, ",")))
 		}
 	}
@@ -50,6 +53,9 @@ func parseLabelFilters(rawFilters []string) ([]string, map[string][]string) {
 func generateLabelSelector(f filters.Args, stackName string) string {
 	names := f.Get("name")
 
+	// make result more testable by sorting names
+	sort.Strings(names)
+
 	for _, n := range names {
 		if strings.HasPrefix(n, stackName+"_") {
 			// also accepts with unprefixed service name (for compat with existing swarm scripts where service names are prefixed by stack names)

cli/command/stack/kubernetes/services_test.go

@@ -91,6 +91,17 @@ func TestSerficeFiltersLabelSelectorGen(t *testing.T) {
 				"label2=test2",
 			},
 		},
+		{
+			name:      "name filter with stackName prefix",
+			stackName: "test",
+			filters: filters.NewArgs(
+				filters.KeyValuePair{Key: "name", Value: "test_svc1"},
+			),
+			expectedSelectorParts: []string{
+				"com.docker.stack.namespace=test",
+				"com.docker.service.name in (test_svc1,svc1)",
+			},
+		},
 	}
 
 	for _, c := range cases {