Skip to content

chore: change how relationship integrity tests watch to hopefully remove the flakiness #2677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: change how relationship integrity tests watch to hopefully remove the flakiness #2677

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions internal/datastore/proxy/relationshipintegrity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,18 +248,28 @@ func TestWatchIntegrityFailureDueToInvalidHashSignature(t *testing.T) {
ds, err := dsfortesting.NewMemDBDatastoreForTesting(0, 5*time.Second, 1*time.Hour)
require.NoError(t, err)

headRev, err := ds.HeadRevision(t.Context())
require.NoError(t, err)

pds, err := NewRelationshipIntegrityProxy(ds, DefaultKeyForTesting, nil)
require.NoError(t, err)

watchEvents, errChan := pds.Watch(t.Context(), headRev, datastore.WatchJustRelationships())
// Insert an invalid relationship to get a working revision to watch from.
validWriteRev, err := ds.ReadWriteTx(t.Context(), func(ctx context.Context, tx datastore.ReadWriteTransaction) error {
invalidTpl := tuple.MustParse("resource:foo#viewer@user:jimmy")
invalidTpl.OptionalIntegrity = &core.RelationshipIntegrity{
KeyId: "defaultfortest",
Hash: append([]byte{0x01}, []byte("someinvalidhashaasd")[0:hashLength]...),
HashedAt: timestamppb.Now(),
}

// Insert an invalid integrity hash for one of the relationships to be invalid by bypassing
return tx.WriteRelationships(t.Context(), []tuple.RelationshipUpdate{
tuple.Create(invalidTpl),
})
})
require.NoError(t, err)

// Insert another invalid integrity hash for one of the relationships to be invalid by bypassing
// the proxy.
_, err = ds.ReadWriteTx(t.Context(), func(ctx context.Context, tx datastore.ReadWriteTransaction) error {
invalidTpl := tuple.MustParse("resource:foo#viewer@user:jimmy")
invalidTpl := tuple.MustParse("resource:foo#viewer@user:timmy")
invalidTpl.OptionalIntegrity = &core.RelationshipIntegrity{
KeyId: "defaultfortest",
Hash: append([]byte{0x01}, []byte("someinvalidhashaasd")[0:hashLength]...),
Expand All @@ -272,10 +282,12 @@ func TestWatchIntegrityFailureDueToInvalidHashSignature(t *testing.T) {
})
require.NoError(t, err)

watchEvents, errChan := pds.Watch(t.Context(), validWriteRev, datastore.WatchJustRelationships())

// Ensure a watch error is raised.
select {
case <-watchEvents:
require.Fail(t, "watch event received")
case we := <-watchEvents:
require.Fail(t, "watch event received: %v", we)

case err := <-errChan:
require.Error(t, err)
Expand Down
Loading