Skip to content

Commit

Permalink
cassandane: annotate various tests with component requirements
Browse files Browse the repository at this point in the history
this isn't everything but it's not nothing
  • Loading branch information
elliefm committed Feb 21, 2023
1 parent f99a6eb commit e7e5a11
Show file tree
Hide file tree
Showing 8 changed files with 163 additions and 26 deletions.
8 changes: 4 additions & 4 deletions cassandane/Cassandane/Cyrus/Conversations.pm
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ sub _munge_annot_crc
$fh->close();
}
sub test_replication_reply_200
:min_version_3_1
:min_version_3_1 :needs_component_replication
{
my ($self) = @_;
my %exp;
Expand Down Expand Up @@ -471,7 +471,7 @@ sub test_replication_reply_200
# Test APPEND of messages to IMAP
#
sub test_replication_reconstruct
:min_version_3_1
:min_version_3_1 :needs_component_replication
{
my ($self) = @_;
my %exp;
Expand Down Expand Up @@ -633,7 +633,7 @@ sub bogus_test_double_clash
# Test that a CID clash resolved on the master is replicated
#
sub bogus_test_replication_clash
:min_version_3_0
:min_version_3_0 :needs_component_replication
{
my ($self) = @_;
my %exp;
Expand Down Expand Up @@ -877,7 +877,7 @@ sub bogus_test_cross_user_copy
# Test APPEND of messages to IMAP
#
sub test_replication_trashseen
:min_version_3_1
:min_version_3_1 :needs_component_replication
{
my ($self) = @_;
my %exp;
Expand Down
9 changes: 9 additions & 0 deletions cassandane/Cassandane/Cyrus/FastMail.pm
Original file line number Diff line number Diff line change
Expand Up @@ -1331,6 +1331,7 @@ sub test_rename_deepfolder_intermediates_rightnow

sub test_imap_list_notes
:min_version_3_1 :needs_component_sieve
:needs_component_httpd
{
my ($self) = @_;

Expand Down Expand Up @@ -1413,6 +1414,7 @@ sub test_imap_list_notes

sub test_cyr_expire_delete_findpaths_legacy
:DelayedDelete :min_version_3_5 :MailboxLegacyDirs
:needs_component_httpd
{
my ($self) = @_;

Expand Down Expand Up @@ -1482,6 +1484,7 @@ sub test_cyr_expire_delete_findpaths_legacy

sub test_cyr_expire_delete_findpaths_nolegacy
:DelayedDelete :min_version_3_5 :NoMailboxLegacyDirs
:needs_component_httpd
{
my ($self) = @_;

Expand Down Expand Up @@ -1555,6 +1558,7 @@ sub test_cyr_expire_delete_findpaths_nolegacy

sub test_sync_reset_legacy
:DelayedDelete :min_version_3_5 :MailboxLegacyDirs
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -1596,6 +1600,7 @@ sub test_sync_reset_legacy

sub test_sync_reset_nolegacy
:DelayedDelete :min_version_3_5 :NoMailboxLegacyDirs
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -1644,6 +1649,7 @@ sub test_sync_reset_nolegacy

sub test_relocate_legacy_nodomain
:DelayedDelete :min_version_3_5 :MailboxLegacyDirs
:needs_component_httpd
{
my ($self) = @_;

Expand Down Expand Up @@ -1685,6 +1691,7 @@ sub test_relocate_legacy_nodomain

sub test_relocate_legacy_domain
:DelayedDelete :min_version_3_5 :MailboxLegacyDirs
:needs_component_httpd
{
my ($self) = @_;

Expand Down Expand Up @@ -1726,6 +1733,7 @@ sub test_relocate_legacy_domain

sub test_relocate_legacy_nosearchdb
:DelayedDelete :min_version_3_5 :MailboxLegacyDirs
:needs_component_httpd
{
my ($self) = @_;

Expand Down Expand Up @@ -1770,6 +1778,7 @@ sub test_relocate_legacy_nosearchdb

sub test_relocate_messages_still_exist
:DelayedDelete :min_version_3_5 :MailboxLegacyDirs
:needs_component_httpd
{
my ($self) = @_;

Expand Down
9 changes: 9 additions & 0 deletions cassandane/Cassandane/Cyrus/Idle.pm
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ sub common_basic
}

sub test_basic_idled
:needs_component_idled
{
my ($self) = @_;

Expand All @@ -196,6 +197,7 @@ sub test_basic_noidled
}

sub test_basic_abortedidled
:needs_component_idled
{
my ($self) = @_;

Expand Down Expand Up @@ -253,6 +255,7 @@ sub common_delivery
}

sub test_delivery_idled
:needs_component_idled
{
my ($self) = @_;

Expand All @@ -277,6 +280,7 @@ sub test_delivery_noidled
}

sub test_delivery_abortedidled
:needs_component_idled
{
my ($self) = @_;

Expand Down Expand Up @@ -367,6 +371,7 @@ sub common_shutdownfile
}

sub test_shutdownfile_idled
:needs_component_idled
{
my ($self) = @_;

Expand All @@ -391,6 +396,7 @@ sub test_shutdownfile_noidled
}

sub test_shutdownfile_abortedidled
:needs_component_idled
{
my ($self) = @_;

Expand All @@ -404,6 +410,7 @@ sub test_shutdownfile_abortedidled
}

sub test_sigterm
:needs_component_idled
{
my ($self) = @_;

Expand Down Expand Up @@ -471,6 +478,7 @@ sub test_sigterm
}

sub test_sigterm_many
:needs_component_idled
{
my ($self) = @_;

Expand Down Expand Up @@ -543,6 +551,7 @@ sub test_sigterm_many
}

sub test_idled_default_timeout
:needs_component_idled
{
my ($self) = @_;

Expand Down
18 changes: 17 additions & 1 deletion cassandane/Cassandane/Cyrus/Metadata.pm
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ sub test_comment
}

sub test_comment_repl
:Replication :SyncLog
:Replication :SyncLog :needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -771,6 +771,7 @@ sub test_motd
#
sub test_shared_global_annot_replication
:Replication :SyncLog :AnnotationAllowUndefined
:needs_component_idled
{
my ($self) = @_;

Expand Down Expand Up @@ -879,6 +880,7 @@ sub test_shared_global_annot_replication
#
sub test_private_global_annot_replication
:Replication :SyncLog :AnnotationAllowUndefined
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -1411,6 +1413,7 @@ sub set_msg_annotation
}

sub test_msg_replication_new_mas
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -1456,6 +1459,7 @@ sub test_msg_replication_new_mas
}

sub test_msg_replication_new_rep
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -1501,6 +1505,7 @@ sub test_msg_replication_new_rep
}

sub test_msg_replication_new_bot_mse_gul
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -1570,6 +1575,7 @@ sub test_msg_replication_new_bot_mse_gul
}

sub test_msg_replication_new_bot_mse_guh
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -1640,6 +1646,7 @@ sub test_msg_replication_new_bot_mse_guh


sub test_msg_replication_mod_mas
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -1703,6 +1710,7 @@ sub test_msg_replication_mod_mas


sub test_msg_replication_mod_rep
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -1765,6 +1773,7 @@ sub test_msg_replication_mod_rep
}

sub test_msg_replication_mod_bot_msl
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -1834,6 +1843,7 @@ sub test_msg_replication_mod_bot_msl
}

sub test_msg_replication_mod_bot_msh
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -1903,6 +1913,7 @@ sub test_msg_replication_mod_bot_msh
}

sub test_msg_replication_exp_mas
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -1971,6 +1982,7 @@ sub test_msg_replication_exp_mas
}

sub test_msg_replication_exp_rep
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -2039,6 +2051,7 @@ sub test_msg_replication_exp_rep
}

sub test_msg_replication_exp_bot
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -2113,6 +2126,7 @@ sub test_msg_replication_exp_bot
}

sub test_msg_replication_new_mas_partial_wwsw
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -2151,6 +2165,7 @@ sub test_msg_replication_new_mas_partial_wwsw
}

sub test_msg_replication_new_mas_partial_wwd
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -2595,6 +2610,7 @@ sub test_unchangedsince


sub test_mbox_replication_new_mas
:needs_component_replication
{
my ($self) = @_;

Expand Down
4 changes: 4 additions & 0 deletions cassandane/Cassandane/Cyrus/Quota.pm
Original file line number Diff line number Diff line change
Expand Up @@ -1733,6 +1733,7 @@ sub test_bz3529

# Magic: the word 'replication' in the name enables a replica
sub test_replication_storage
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -1809,6 +1810,7 @@ sub test_replication_storage

# Magic: the word 'replication' in the name enables a replica
sub test_replication_message
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -1885,6 +1887,7 @@ sub test_replication_message

# Magic: the word 'replication' in the name enables a replica
sub test_replication_annotstorage
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -2048,6 +2051,7 @@ sub XXtest_getset_multiple

# Magic: the word 'replication' in the name enables a replica
sub XXtest_replication_multiple
:needs_component_replication
{
my ($self) = @_;

Expand Down
4 changes: 3 additions & 1 deletion cassandane/Cassandane/Cyrus/Rename.pm
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ sub test_rename_user
}

sub test_rename_deepuser
:AllowMoves :Replication :SyncLog
:AllowMoves :Replication :SyncLog :needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -663,6 +663,7 @@ sub test_rename_deepuser

sub test_rename_user_sieve
:AllowMoves :Replication :SyncLog :needs_component_sieve
:needs_component_replication
{
my ($self) = @_;

Expand Down Expand Up @@ -774,6 +775,7 @@ sub test_rename_paths

sub test_rename_deepuser_unixhs
:AllowMoves :Replication :SyncLog :UnixHierarchySep
:needs_component_replication
{
my ($self) = @_;

Expand Down
Loading

0 comments on commit e7e5a11

Please sign in to comment.