github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

fix rebase test error

Browse Source
This commit is contained in:
Jingtao Ren 2017-11-20 09:53:34 -08:00
parent 1e3ec2b639
commit 35964d4a80
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/cloudprovider/providers/azure/azure_test.go
View File

@ -581,17 +581,13 @@ func findLBRuleForPort(lbRules []network.LoadBalancingRule, port int32) (network
func TestServiceDefaultsToNoSessionPersistence(t *testing.T) { func TestServiceDefaultsToNoSessionPersistence(t *testing.T) {
az := getTestCloud() az := getTestCloud()
svc := getTestService("service-sa-omitted", v1.ProtocolTCP, 7170) svc := getTestService("service-sa-omitted", v1.ProtocolTCP, 7170)
configProperties := getTestPublicFipConfigurationProperties() clusterResources := getClusterResources(az, 1, 1)
lb := getTestLoadBalancer()
nodes := []*v1.Node{}
lb, _, err := az.reconcileLoadBalancer(lb, &configProperties, testClusterName, &svc, nodes) lb, err := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true /* wantLb */)
if err != nil { if err != nil {
t.Errorf("Unexpected error reconciling svc1: %q", err) t.Errorf("Unexpected error reconciling svc1: %q", err)
} }
validateLoadBalancer(t, lb, svc) validateLoadBalancer(t, lb, svc)
lbRule, err := findLBRuleForPort(*lb.LoadBalancingRules, 7170) lbRule, err := findLBRuleForPort(*lb.LoadBalancingRules, 7170)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
@ -606,11 +602,9 @@ func TestServiceRespectsNoSessionAffinity(t *testing.T) {
az := getTestCloud() az := getTestCloud()
svc := getTestService("service-sa-none", v1.ProtocolTCP, 7170) svc := getTestService("service-sa-none", v1.ProtocolTCP, 7170)
svc.Spec.SessionAffinity = v1.ServiceAffinityNone svc.Spec.SessionAffinity = v1.ServiceAffinityNone
configProperties := getTestPublicFipConfigurationProperties() clusterResources := getClusterResources(az, 1, 1)
lb := getTestLoadBalancer()
nodes := []*v1.Node{}
lb, _, err := az.reconcileLoadBalancer(lb, &configProperties, testClusterName, &svc, nodes) lb, err := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true /* wantLb */)
if err != nil { if err != nil {
t.Errorf("Unexpected error reconciling svc1: %q", err) t.Errorf("Unexpected error reconciling svc1: %q", err)
} }
@ -631,11 +625,9 @@ func TestServiceRespectsClientIPSessionAffinity(t *testing.T) {
az := getTestCloud() az := getTestCloud()
svc := getTestService("service-sa-clientip", v1.ProtocolTCP, 7170) svc := getTestService("service-sa-clientip", v1.ProtocolTCP, 7170)
svc.Spec.SessionAffinity = v1.ServiceAffinityClientIP svc.Spec.SessionAffinity = v1.ServiceAffinityClientIP
configProperties := getTestPublicFipConfigurationProperties() clusterResources := getClusterResources(az, 1, 1)
lb := getTestLoadBalancer()
nodes := []*v1.Node{}
lb, _, err := az.reconcileLoadBalancer(lb, &configProperties, testClusterName, &svc, nodes) lb, err := az.reconcileLoadBalancer(testClusterName, &svc, clusterResources.nodes, true /* wantLb */)
if err != nil { if err != nil {
t.Errorf("Unexpected error reconciling svc1: %q", err) t.Errorf("Unexpected error reconciling svc1: %q", err)
} }