Merge pull request containerd#4273 from haytok/update_portutil_test_on_the_last

test: update test functions in portutil_test.go

Author: AkihiroSuda

pkg/portutil/portutil_test.go

@@ -30,7 +30,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
 )
 
-func TestTestParseFlagPWithPlatformSpec(t *testing.T) {
+func TestParseFlagPWithPlatformSpec(t *testing.T) {
 	if runtime.GOOS != "linux" || rootlessutil.IsRootless() {
 		t.Skip("no non-Linux platform or rootless mode in Linux are not supported yet")
 	}
@@ -232,10 +232,10 @@ func TestParseFlagP(t *testing.T) {
 		s string
 	}
 	tests := []struct {
-		name    string
-		args    args
-		want    []cni.PortMapping
-		wantErr bool
+		name       string
+		args       args
+		want       []cni.PortMapping
+		wantErrMsg string
 	}{
 		{
 			name: "normal",
@@ -250,7 +250,7 @@ func TestParseFlagP(t *testing.T) {
 					HostIP:        "127.0.0.1",
 				},
 			},
-			wantErr: false,
+			wantErrMsg: "",
 		},
 		{
 			name: "with port range",
@@ -271,15 +271,15 @@ func TestParseFlagP(t *testing.T) {
 					HostIP:        "127.0.0.1",
 				},
 			},
-			wantErr: false,
+			wantErrMsg: "",
 		},
 		{
 			name: "with wrong port range",
 			args: args{
 				s: "127.0.0.1:3000-3001:8080-8082/tcp",
 			},
-			want:    nil,
-			wantErr: true,
+			want:       nil,
+			wantErrMsg: "invalid ranges specified for container and host Ports: 8080-8082 and 3000-3001",
 		},
 		{
 			name: "without host ip",
@@ -294,7 +294,7 @@ func TestParseFlagP(t *testing.T) {
 					HostIP:        "0.0.0.0",
 				},
 			},
-			wantErr: false,
+			wantErrMsg: "",
 		},
 		{
 			name: "without protocol",
@@ -309,7 +309,7 @@ func TestParseFlagP(t *testing.T) {
 					HostIP:        "0.0.0.0",
 				},
 			},
-			wantErr: false,
+			wantErrMsg: "",
 		},
 		{
 			name: "with protocol udp",
@@ -324,10 +324,10 @@ func TestParseFlagP(t *testing.T) {
 					HostIP:        "0.0.0.0",
 				},
 			},
-			wantErr: false,
+			wantErrMsg: "",
 		},
 		{
-			name: "with protocol udp",
+			name: "with protocol sctp",
 			args: args{
 				s: "3000:8080/sctp",
 			},
@@ -339,7 +339,7 @@ func TestParseFlagP(t *testing.T) {
 					HostIP:        "0.0.0.0",
 				},
 			},
-			wantErr: false,
+			wantErrMsg: "",
 		},
 		{
 			name: "with ipv6 host ip",
@@ -354,86 +354,82 @@ func TestParseFlagP(t *testing.T) {
 					HostIP:        "::0",
 				},
 			},
-			wantErr: false,
+			wantErrMsg: "",
 		},
 		{
 			name: "with invalid protocol",
 			args: args{
 				s: "3000:8080/invalid",
 			},
-			want:    nil,
-			wantErr: true,
+			want:       nil,
+			wantErrMsg: `invalid protocol "invalid"`,
 		},
 		{
 			name: "multiple colon",
 			args: args{
 				s: "127.0.0.1:3000:0.0.0.0:8080",
 			},
-			want:    nil,
-			wantErr: true,
+			want:       nil,
+			wantErrMsg: "invalid hostPort: 127.0.0.1:3000:0.0.0.0",
 		},
 		{
 			name: "multiple slash",
 			args: args{
 				s: "127.0.0.1:3000:8080/tcp/",
 			},
-			want:    nil,
-			wantErr: true,
+			want:       nil,
+			wantErrMsg: `failed to parse "127.0.0.1:3000:8080/tcp/", unexpected slashes`,
 		},
 		{
 			name: "invalid ip",
 			args: args{
 				s: "127.0.0.256:3000:8080/tcp",
 			},
-			want:    nil,
-			wantErr: true,
+			want:       nil,
+			wantErrMsg: "invalid ip address: 127.0.0.256",
 		},
 		{
 			name: "large port",
 			args: args{
 				s: "3000:65536",
 			},
-			want:    nil,
-			wantErr: true,
+			want:       nil,
+			wantErrMsg: "invalid containerPort: 65536",
 		},
 		{
 			name: "blank",
 			args: args{
 				s: "",
 			},
-			want:    nil,
-			wantErr: true,
+			want:       nil,
+			wantErrMsg: "no port specified: ",
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := ParseFlagP(tt.args.s)
-			t.Log(err)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("ParseFlagP() error = %v, wantErr %v", err, tt.wantErr)
-				return
+			if tt.wantErrMsg == "" {
+				assert.NilError(t, err)
+			} else {
+				assert.Error(t, err, tt.wantErrMsg)
 			}
 			if !reflect.DeepEqual(got, tt.want) {
-				if len(got) == len(tt.want) {
-					if len(got) > 1 {
-						var hostPorts []int32
-						var containerPorts []int32
-						for _, value := range got {
-							hostPorts = append(hostPorts, value.HostPort)
-							containerPorts = append(containerPorts, value.ContainerPort)
-						}
-						sort.Slice(hostPorts, func(i, j int) bool {
-							return i < j
-						})
-						sort.Slice(containerPorts, func(i, j int) bool {
-							return i < j
-						})
-						if (hostPorts[len(hostPorts)-1] - hostPorts[0]) != (containerPorts[len(hostPorts)-1] - containerPorts[0]) {
-							t.Errorf("ParseFlagP() = %v, want %v", got, tt.want)
-						}
+				assert.Equal(t, len(got), len(tt.want))
+				if len(got) > 0 {
+					sort.Slice(got, func(i, j int) bool {
+						return got[i].HostPort < got[j].HostPort
+					})
+					assert.Equal(
+						t,
+						got[len(got)-1].HostPort-got[0].HostPort,
+						got[len(got)-1].ContainerPort-got[0].ContainerPort,
+					)
+					for i := range len(got) {
+						assert.Equal(t, got[i].HostPort, tt.want[i].HostPort)
+						assert.Equal(t, got[i].ContainerPort, tt.want[i].ContainerPort)
+						assert.Equal(t, got[i].Protocol, tt.want[i].Protocol)
+						assert.Equal(t, got[i].HostIP, tt.want[i].HostIP)
 					}
-				} else {
-					t.Errorf("ParseFlagP() = %v, want %v", got, tt.want)
 				}
 			}
 		})