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

Fix flaky 50federation/40publicroomlist.pl #811

Merged
merged 1 commit into from
Feb 19, 2020
Merged

Fix flaky 50federation/40publicroomlist.pl #811

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
137 changes: 74 additions & 63 deletions tests/50federation/40publicroomlist.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,74 +29,85 @@
visibility => "public",
room_alias_name => $alias_local,
%$room,
)
)->on_done( sub {
my ( $room_id ) = @_;
log_if_fail "Created room $room_id with alias $alias_local";
});
} keys %rooms )
->then( sub {
$client->do_request_json(
method => "GET",
hostname => $server_name,
uri => "/v1/publicRooms",
)
})->then( sub {
my ( $body ) = @_;

log_if_fail "publicRooms", $body;

assert_json_keys( $body, qw( chunk ));
assert_json_list( $body->{chunk} );

my %seen = map {
$_ => 0,
} keys ( %rooms );

foreach my $room ( @{ $body->{chunk} } ) {
assert_json_keys( $room,
qw( world_readable guest_can_join num_joined_members )
);

my $name = $room->{name};
my $topic = $room->{topic};
my $canonical_alias = $room->{canonical_alias};

my $aliases = $room->{aliases};
defined $aliases or next;

foreach my $alias ( @{$aliases} ) {
foreach my $alias_local ( keys %rooms ) {
$alias =~ m/^\Q#$alias_local:\E/ or next;

my $room_config = $rooms{$alias_local};

log_if_fail "Alias", $alias_local;
log_if_fail "Room", $room;

assert_eq( $canonical_alias, $alias, "canonical alias" );
assert_eq( $room->{num_joined_members}, 1, "num_joined_members" );

if( defined $name ) {
assert_eq( $room_config->{name}, $name, 'room name' );
}
else {
defined $room_config->{name} and die "Expected not to find a name";
}

if( defined $topic ) {
assert_eq( $room_config->{topic}, $topic, 'room topic' );
}
else {
defined $room_config->{topic} and die "Expected not to find a topic";
my $iter = 0;
retry_until_success {
$client->do_request_json(
method => "GET",
hostname => $server_name,
uri => "/v1/publicRooms",
)->then( sub {
my ($body) = @_;

$iter++;
log_if_fail "Iteration $iter: publicRooms result", $body;

assert_json_keys($body, qw(chunk));
assert_json_list($body->{chunk});

my %seen = map {
$_ => 0,
} keys(%rooms);

foreach my $room (@{$body->{chunk}}) {
assert_json_keys($room,
qw(world_readable guest_can_join num_joined_members)
);

my $name = $room->{name};
my $topic = $room->{topic};
my $canonical_alias = $room->{canonical_alias};

my $aliases = $room->{aliases};
defined $aliases or next;

foreach my $alias (@{$aliases}) {
foreach my $alias_local (keys %rooms) {
$alias =~ m/^\Q#$alias_local:\E/ or next;

my $room_config = $rooms{$alias_local};

log_if_fail "Alias", $alias_local;
log_if_fail "Room", $room;

assert_eq($canonical_alias, $alias, "canonical alias");
assert_eq($room->{num_joined_members}, 1, "num_joined_members");

if (defined $name) {
assert_eq($room_config->{name}, $name, 'room name');
}
else {
defined $room_config->{name} and die "Expected not to find a name";
}

if (defined $topic) {
assert_eq($room_config->{topic}, $topic, 'room topic');
}
else {
defined $room_config->{topic} and die "Expected not to find a topic";
}

$seen{$alias_local} = 1;
last;
}
}

$seen{$alias_local} = 1;
last;
}
}
}

foreach my $key ( keys %seen ) {
$seen{$key} or die "Did not find a /publicRooms result for $key";
}
foreach my $key (keys %seen) {
$seen{$key} or die "Did not find a /publicRooms result for $key";
}

Future->done(1);
Future->done(1);
})->on_fail(sub {
my ($exc) = @_;
chomp $exc;
log_if_fail "Iteration $iter: not ready yet: $exc";
});
};
})
}