github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #93906 from aojea/flakeSvc

Browse Source 
Deflake TestServiceRegistryUpdateDryRun test
This commit is contained in:
Kubernetes Prow Robot 2020-08-18 15:45:10 -07:00 committed by GitHub
commit bdb99c8e09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/registry/core/service/storage/rest_test.go
View File

@ -1182,10 +1182,10 @@ func TestServiceRegistryUpdateDryRun(t *testing.T) {
}}, }},
}, },
}, rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) }, rest.ValidateAllObjectFunc, &metav1.CreateOptions{})
svc := obj.(*api.Service)
if err != nil { if err != nil {
t.Fatalf("Expected no error: %v", err) t.Fatalf("Expected no error: %v", err)
} }
svc := obj.(*api.Service)
// Test dry run update request external name to node port // Test dry run update request external name to node port
updatedSvc, created, err := storage.Update(ctx, svc.Name, rest.DefaultUpdatedObjectInfo(&api.Service{ updatedSvc, created, err := storage.Update(ctx, svc.Name, rest.DefaultUpdatedObjectInfo(&api.Service{
@ -1251,6 +1251,7 @@ func TestServiceRegistryUpdateDryRun(t *testing.T) {
Selector: map[string]string{"bar": "baz"}, Selector: map[string]string{"bar": "baz"},
SessionAffinity: api.ServiceAffinityNone, SessionAffinity: api.ServiceAffinityNone,
Type: api.ServiceTypeNodePort, Type: api.ServiceTypeNodePort,
ClusterIP: "1.2.3.5",
Ports: []api.ServicePort{{ Ports: []api.ServicePort{{
NodePort: 30020, NodePort: 30020,
Port: 6502, Port: 6502,
@ -1259,10 +1260,11 @@ func TestServiceRegistryUpdateDryRun(t *testing.T) {
}}, }},
}, },
}, rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) }, rest.ValidateAllObjectFunc, &metav1.CreateOptions{})
svc = obj.(*api.Service)
if err != nil { if err != nil {
t.Fatalf("Expected no error: %v", err) t.Fatalf("Expected no error: %v", err)
} }
svc = obj.(*api.Service)
_, _, err = storage.Update(ctx, svc.Name, rest.DefaultUpdatedObjectInfo(&api.Service{ _, _, err = storage.Update(ctx, svc.Name, rest.DefaultUpdatedObjectInfo(&api.Service{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: svc.Name, Name: svc.Name,
@ -1301,10 +1303,10 @@ func TestServiceRegistryUpdateDryRun(t *testing.T) {
}}, }},
}, },
}, rest.ValidateAllObjectFunc, &metav1.CreateOptions{}) }, rest.ValidateAllObjectFunc, &metav1.CreateOptions{})
svc = obj.(*api.Service)
if err != nil { if err != nil {
t.Fatalf("Expected no error: %v", err) t.Fatalf("Expected no error: %v", err)
} }
svc = obj.(*api.Service)
_, _, err = storage.Update(ctx, svc.Name, rest.DefaultUpdatedObjectInfo(&api.Service{ _, _, err = storage.Update(ctx, svc.Name, rest.DefaultUpdatedObjectInfo(&api.Service{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: svc.Name, Name: svc.Name,