Skip to content

Tests for room version upgrades#513

Merged
richvdh merged 9 commits into
developfrom
rav/room_version_upgrades
Oct 30, 2018
Merged

Tests for room version upgrades#513
richvdh merged 9 commits into
developfrom
rav/room_version_upgrades

Conversation

@richvdh
Copy link
Copy Markdown
Member

@richvdh richvdh commented Oct 25, 2018

tests for matrix-org/synapse#4091

builds on top of #514

@richvdh
Copy link
Copy Markdown
Member Author

richvdh commented Oct 25, 2018

@matrixbot retest this please

@richvdh richvdh force-pushed the rav/room_version_upgrades branch from d9db930 to f969e0d Compare October 25, 2018 22:32
@richvdh richvdh requested a review from a team October 25, 2018 22:45
@richvdh richvdh force-pushed the rav/room_version_upgrades branch from 41b12b2 to f969e0d Compare October 26, 2018 23:01
Comment thread tests/00expect_http_fail.pl Outdated
Future->done( $body );
});
}
push @EXPORT, qw/expect_matrix_error/;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Do we not normally do qw( ... )?

Comment thread tests/00expect_http_fail.pl Outdated
my $f = shift;
my ( $f, $expected_errcode, %opts ) = @_;

my $expected_http_code = $opts{http_code} // 400;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think it would be clearer to always require the HTTP code, so it becomes something like:

)->expect_matrix_error(418, 'M_EXPECTED_ERROR')

@richvdh
Copy link
Copy Markdown
Member Author

richvdh commented Oct 29, 2018

Bah, this is now failing CI because matrix-org/synapse#4099 has landed and changed the way things work.

This should mean we can reduce some boilerplate in some of the other tests.
@richvdh
Copy link
Copy Markdown
Member Author

richvdh commented Oct 30, 2018

Erik could you have another look at this now that I've refactored the world?

@richvdh richvdh requested a review from erikjohnston October 30, 2018 16:23
@richvdh richvdh merged commit 5151c7a into develop Oct 30, 2018
@richvdh richvdh deleted the rav/room_version_upgrades branch October 30, 2018 19:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants