github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #83289 from beautytiger/dev-190929-sctp

Browse Source 
fix unit test in hostport_manager_test.go
This commit is contained in:
Kubernetes Prow Robot 2019-12-02 21:42:57 -08:00 committed by GitHub
commit 1e2b6176aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkg/kubelet/dockershim/network/hostport/hostport_manager_test.go
View File

@ -45,9 +45,9 @@ func TestOpenCloseHostports(t *testing.T) {
Namespace: "ns1", Namespace: "ns1",
Name: "n1", Name: "n1",
PortMappings: []*PortMapping{ PortMappings: []*PortMapping{
{HostPort: 80, Protocol: v1.Protocol("TCP")}, {HostPort: 80, Protocol: v1.ProtocolTCP},
{HostPort: 8080, Protocol: v1.Protocol("TCP")}, {HostPort: 8080, Protocol: v1.ProtocolTCP},
{HostPort: 443, Protocol: v1.Protocol("TCP")}, {HostPort: 443, Protocol: v1.ProtocolTCP},
}, },
}, },
false, false,
@ -57,7 +57,7 @@ func TestOpenCloseHostports(t *testing.T) {
Namespace: "ns1", Namespace: "ns1",
Name: "n2", Name: "n2",
PortMappings: []*PortMapping{ PortMappings: []*PortMapping{
{HostPort: 80, Protocol: v1.Protocol("TCP")}, {HostPort: 80, Protocol: v1.ProtocolTCP},
}, },
}, },
true, true,
@ -67,8 +67,8 @@ func TestOpenCloseHostports(t *testing.T) {
Namespace: "ns1", Namespace: "ns1",
Name: "n3", Name: "n3",
PortMappings: []*PortMapping{ PortMappings: []*PortMapping{
{HostPort: 8081, Protocol: v1.Protocol("TCP")}, {HostPort: 8081, Protocol: v1.ProtocolTCP},
{HostPort: 8080, Protocol: v1.Protocol("TCP")}, {HostPort: 8080, Protocol: v1.ProtocolTCP},
}, },
}, },
true, true,
@ -78,7 +78,7 @@ func TestOpenCloseHostports(t *testing.T) {
Namespace: "ns1", Namespace: "ns1",
Name: "n3", Name: "n3",
PortMappings: []*PortMapping{ PortMappings: []*PortMapping{
{HostPort: 8081, Protocol: v1.Protocol("TCP")}, {HostPort: 8081, Protocol: v1.ProtocolTCP},
}, },
}, },
false, false,
@ -88,7 +88,7 @@ func TestOpenCloseHostports(t *testing.T) {
Namespace: "ns1", Namespace: "ns1",
Name: "n4", Name: "n4",
PortMappings: []*PortMapping{ PortMappings: []*PortMapping{
{HostPort: 7777, Protocol: v1.Protocol("STCP")}, {HostPort: 7777, Protocol: v1.ProtocolSCTP},
}, },
}, },
false, false,
@ -111,7 +111,13 @@ func TestOpenCloseHostports(t *testing.T) {
continue continue
} }
assert.NoError(t, err) assert.NoError(t, err)
assert.EqualValues(t, len(mapping), len(tc.podPortMapping.PortMappings)) countSctp := 0
for _, pm := range tc.podPortMapping.PortMappings {
if pm.Protocol == v1.ProtocolSCTP {
countSctp += 1
}
}
assert.EqualValues(t, len(mapping), len(tc.podPortMapping.PortMappings)-countSctp)
} }
// We have 4 ports: 80, 443, 8080, 8081 open now. // We have 4 ports: 80, 443, 8080, 8081 open now.
@ -125,36 +131,36 @@ func TestOpenCloseHostports(t *testing.T) {
{ {
portMappings: []*PortMapping{ portMappings: []*PortMapping{
{HostPort: 80, Protocol: v1.Protocol("TCP")}, {HostPort: 80, Protocol: v1.ProtocolTCP},
{HostPort: 8080, Protocol: v1.Protocol("TCP")}, {HostPort: 8080, Protocol: v1.ProtocolTCP},
{HostPort: 443, Protocol: v1.Protocol("TCP")}, {HostPort: 443, Protocol: v1.ProtocolTCP},
}, },
}, },
{ {
portMappings: []*PortMapping{ portMappings: []*PortMapping{
{HostPort: 80, Protocol: v1.Protocol("TCP")}, {HostPort: 80, Protocol: v1.ProtocolTCP},
}, },
}, },
{ {
portMappings: []*PortMapping{ portMappings: []*PortMapping{
{HostPort: 8081, Protocol: v1.Protocol("TCP")}, {HostPort: 8081, Protocol: v1.ProtocolTCP},
{HostPort: 8080, Protocol: v1.Protocol("TCP")}, {HostPort: 8080, Protocol: v1.ProtocolTCP},
}, },
}, },
{ {
portMappings: []*PortMapping{ portMappings: []*PortMapping{
{HostPort: 8081, Protocol: v1.Protocol("TCP")}, {HostPort: 8081, Protocol: v1.ProtocolTCP},
}, },
}, },
{ {
portMappings: []*PortMapping{ portMappings: []*PortMapping{
{HostPort: 7070, Protocol: v1.Protocol("TCP")}, {HostPort: 7070, Protocol: v1.ProtocolTCP},
}, },
}, },
{ {
portMappings: []*PortMapping{ portMappings: []*PortMapping{
{HostPort: 7777, Protocol: v1.Protocol("SCTP")}, {HostPort: 7777, Protocol: v1.ProtocolSCTP},
}, },
}, },
} }