github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #125733 from wojtek-t/test_watch_semantics_flake

Browse Source 
Fix test flakes for TestWatchSemantics
This commit is contained in:
Kubernetes Prow Robot
2024-06-26 13:09:45 -07:00
committed by GitHub
parent 59d90eb17e 5081ba45f9
commit c7e316374c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/apiserver/pkg/storage/testing/watcher_tests.go
View File

@@ -1486,11 +1486,15 @@ func RunWatchSemantics(ctx context.Context, t *testing.T, store storage.Interfac
expectedBookmarkEventWithMinRV := scenario.expectedInitialEventsBookmarkWithMinimalRV(createdPods) expectedBookmarkEventWithMinRV := scenario.expectedInitialEventsBookmarkWithMinimalRV(createdPods)
expectedObj, err := meta.Accessor(expectedBookmarkEventWithMinRV.Object) expectedObj, err := meta.Accessor(expectedBookmarkEventWithMinRV.Object)
require.NoError(t, err) require.NoError(t, err)
expectedRV, err := storage.APIObjectVersioner{}.ObjectResourceVersion(expectedBookmarkEventWithMinRV.Object)
require.NoError(t, err)
actualObj, err := meta.Accessor(actualEvent.Object) actualObj, err := meta.Accessor(actualEvent.Object)
require.NoError(t, err) require.NoError(t, err)
actualRV, err := storage.APIObjectVersioner{}.ObjectResourceVersion(actualEvent.Object)
require.NoError(t, err)
require.GreaterOrEqual(t, actualObj.GetResourceVersion(), expectedObj.GetResourceVersion()) require.GreaterOrEqual(t, actualRV, expectedRV)
// once we know that the RV is at least >= the expected one // once we know that the RV is at least >= the expected one
// rewrite it so that we can compare the objs // rewrite it so that we can compare the objs