Skip to content
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

Jump to bottom

Update state idempotency tests to not use initialsync #960

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Update state idempotency tests to not use initialsync #960

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4257d7
Update state idempotency tests to not use initialsync
neilalexander Sep 24, 2020
462418a
Remove warning comments
neilalexander Sep 24, 2020
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
24 changes: 16 additions & 8 deletions tests/30rooms/01state.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,14 +242,24 @@ sub get_test_state
{
my ( $user, $room_id, $type ) = @_;

matrix_initialsync_room( $user, $room_id, limit => 0 )->then( sub {
my ( $body ) = @_;
matrix_sync( $user,
filter => '{"room":{"rooms":["'.$room_id.'"]},"account_data":{},"presence":{"types":[]}}',
update_next_batch => 0,
set_presence => "offline",
)->then( sub {
my ( $body ) = @_;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm no fan of the 3-space indentation convention, but 5 spaces doesn't seem an improvement...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VS Code yet again :/


my %state_by_type = partition_by { $_->{type} } @{ $body->{state} };
# We expect the event to be in the initial sync
sync_timeline_contains( $body, $room_id, sub {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think sync_timeline_contains returns a truthy result? shouldn't we be doing something with that result (otherwise the call is redundant?)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just copy-pasta'd from elsewhere, but I figured that if the timeline didn't hit the sub and match the event we want, that the Future wouldn't be done?

my ( $event ) = @_;
return unless $event->{type} eq $type and $event->{state_key} eq $user->user_id;

my $event_id = $state_by_type{ $type }[0]{event_id};
log_if_fail "Event for ${\$user->user_id}", $event;
Future->done( $event->{event_id} );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this creates a Future which is discarded?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah I think this should be at the higher level?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Honestly I have no idea. I still don't think I grok how this works looking at it again.

return 1;
}) or die "Expected event not in initial sync";

Future->done( $event_id );
return 0;
});
}

Expand All @@ -259,15 +269,14 @@ sub set_test_state

matrix_put_room_state( $user, $room_id,
type => "a.test.state.type",
state_key => "",
state_key => $user->user_id,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this change, ooi?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly just to match the filter return unless $event->{type} eq $type and $event->{state_key} eq $user->user_id; in sync_timeline_contains.

content => { "a_key" => "a_value" },
)->then( sub {
get_test_state( $user, $room_id, "a.test.state.type" );
});
}

test "Setting state twice is idempotent",
# TODO: deprecated endpoint used in this test
# Setting synced to 1 inserts a m.room.test object into the
# timeline which this test does not expect
requires => [ local_user_and_room_fixtures( room_opts => { synced => 0 } ) ],
Expand All @@ -292,7 +301,6 @@ sub set_test_state
};

test "Joining room twice is idempotent",
# TODO: deprecated endpoint used in this test
requires => [ local_user_and_room_fixtures() ],

check => sub {
Expand Down