From 2cffb353ea4597e1181a224ca3677fc798c4ea21 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 3 Jul 2019 15:50:16 +0100 Subject: [PATCH 1/2] Remove bug parameter, and reimplement functionality with a blacklist --- docker/synapse_sytest.sh | 2 +- run-tests.pl | 9 --------- tests/30rooms/04messages.pl | 3 --- tests/30rooms/13guestaccess.pl | 2 -- tests/31sync/15lazy-members.pl | 2 -- tests/40presence.pl | 3 --- tests/41end-to-end-keys/01-upload-key.pl | 2 -- tests/52user-directory/01public.pl | 6 ------ tests/61push/07_set_enabled.pl | 2 -- tests/90jira/SYN-115.pl | 4 ---- 10 files changed, 1 insertion(+), 34 deletions(-) diff --git a/docker/synapse_sytest.sh b/docker/synapse_sytest.sh index 21be810b5..8941e6b32 100755 --- a/docker/synapse_sytest.sh +++ b/docker/synapse_sytest.sh @@ -82,7 +82,7 @@ fi >&2 echo "+++ Running tests" RUN_TESTS=( - perl -I "$SYTEST_LIB" ./run-tests.pl --python=/venv/bin/python --synapse-directory=/src --coverage -O tap --all + perl -I "$SYTEST_LIB" ./run-tests.pl --python=/venv/bin/python --synapse-directory=/src -B /src/sytest-blacklist --coverage -O tap --all ) TEST_STATUS=0 diff --git a/run-tests.pl b/run-tests.pl index ec15c4801..643b1de52 100755 --- a/run-tests.pl +++ b/run-tests.pl @@ -107,8 +107,6 @@ 'p|port-range=s' => \(my $PORT_RANGE = "8800:8899"), - 'F|fixed=s' => sub { $FIXED_BUGS{$_}++ for split m/,/, $_[1] }, - 'h|help' => sub { usage(0) }, ) or usage(1); @@ -175,9 +173,6 @@ sub usage -p, --port-range START:MAX - pool of TCP ports to allocate from - -F, --fixed BUGS - bug names that are expected to be fixed - (ignores 'bug' declarations with these names) - . write STDERR; @@ -583,10 +578,6 @@ sub _push_test { my ( $filename, $multi, $name, %params ) = @_; - # We expect this test to fail if it's declared to be dependent on a bug that - # is not yet fixed - $params{expect_fail}++ if $params{bug} and not $FIXED_BUGS{ $params{bug} }; - if( %only_files and not exists $only_files{$filename} ) { $proven{$_} = PRESUMED for @{ $params{proves} // [] }; return; diff --git a/tests/30rooms/04messages.pl b/tests/30rooms/04messages.pl index 3e2f37850..4e5ea04c8 100644 --- a/tests/30rooms/04messages.pl +++ b/tests/30rooms/04messages.pl @@ -154,9 +154,6 @@ requires => [ $senduser_fixture, $remote_fixture, $room_fixture, qw( can_receive_room_message_locally )], - # this test frequently times out for unknown reasons - bug => "synapse#1679", - do => sub { my ( $senduser, $remote_user, $room_id ) = @_; diff --git a/tests/30rooms/13guestaccess.pl b/tests/30rooms/13guestaccess.pl index 0a7704299..fbecb9486 100644 --- a/tests/30rooms/13guestaccess.pl +++ b/tests/30rooms/13guestaccess.pl @@ -489,8 +489,6 @@ test "Guest users can accept invites to private rooms over federation", requires => [ remote_user_fixture(), guest_user_fixture() ], - bug => "synapse#2065", - do => sub { my ( $remote_user, $local_guest ) = @_; diff --git a/tests/31sync/15lazy-members.pl b/tests/31sync/15lazy-members.pl index 5844063e4..ec1145c97 100644 --- a/tests/31sync/15lazy-members.pl +++ b/tests/31sync/15lazy-members.pl @@ -202,8 +202,6 @@ requires => [ local_user_fixtures( 4 ), qw( can_sync ) ], - bug => "vector-im/riot-web#7211", - check => sub { my ( $alice, $bob, $charlie, $dave ) = @_; diff --git a/tests/40presence.pl b/tests/40presence.pl index f1f165c66..d19dfc46a 100644 --- a/tests/40presence.pl +++ b/tests/40presence.pl @@ -124,9 +124,6 @@ requires => [ local_user_fixture(), qw( can_initial_sync )], - # this test fails sometimes. Disable it for now to avoid red-light fatigue. - bug => "synapse#1658", - do => sub { my ( $user ) = @_; diff --git a/tests/41end-to-end-keys/01-upload-key.pl b/tests/41end-to-end-keys/01-upload-key.pl index c7460db3b..0efb5f7d1 100644 --- a/tests/41end-to-end-keys/01-upload-key.pl +++ b/tests/41end-to-end-keys/01-upload-key.pl @@ -38,8 +38,6 @@ test "Should reject keys claiming to belong to a different user", requires => [ $fixture ], - bug => "synapse#1396", - do => sub { my ( $user ) = @_; diff --git a/tests/52user-directory/01public.pl b/tests/52user-directory/01public.pl index 588264747..584304bb6 100644 --- a/tests/52user-directory/01public.pl +++ b/tests/52user-directory/01public.pl @@ -151,9 +151,6 @@ multi_test "Users appear/disappear from directory when $type are changed", requires => [ local_user_fixtures( 2 ) ], - # this test is currently flaky due to a synapse bug - bug => "synapse#2306", - check => sub { my ( $creator, $user ) = @_; @@ -249,9 +246,6 @@ multi_test "Users stay in directory when join_rules are changed but history_visibility is world_readable", requires => [ local_user_fixtures( 2 ) ], - # this test is currently flaky due to a synapse bug - bug => "synapse#2306", - check => sub { my ( $creator, $user ) = @_; diff --git a/tests/61push/07_set_enabled.pl b/tests/61push/07_set_enabled.pl index ef35d55da..c5916f31f 100644 --- a/tests/61push/07_set_enabled.pl +++ b/tests/61push/07_set_enabled.pl @@ -60,8 +60,6 @@ sub check_enable_disable_rule { test "Enabling an unknown default rule fails with 404", requires => [ local_user_fixture() ], - bug => "SYN-676", - check => sub { my ( $user ) = @_; matrix_set_push_rule_enabled( diff --git a/tests/90jira/SYN-115.pl b/tests/90jira/SYN-115.pl index 029d3ae21..28a639500 100644 --- a/tests/90jira/SYN-115.pl +++ b/tests/90jira/SYN-115.pl @@ -4,10 +4,6 @@ requires => [ local_user_fixture(), remote_user_fixture( with_events => 1 ), qw( can_create_private_room )], - # this test fails intermittently on dendron-fronted builds, for unknown - # reasons. - bug => 'synapse#1663', - do => sub { my ( $alice, $bob ) = @_; From 963d583ef2a242a176396797fa0070a075168efe Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 4 Jul 2019 13:57:30 +0100 Subject: [PATCH 2/2] Remove declaration of FIXED_BUGS --- run-tests.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/run-tests.pl b/run-tests.pl index 643b1de52..ee1ccf1f2 100755 --- a/run-tests.pl +++ b/run-tests.pl @@ -55,8 +55,6 @@ # and the like. our $TEST_RUN_ID = strftime( '%Y%m%d_%H%M%S', gmtime() ); -my %FIXED_BUGS; - my $STOP_ON_FAIL; my $SERVER_IMPL = undef;