@@ -1109,61 +1109,6 @@ def test_dont_show_emails(acfactory, lp):
1109
1109
assert len (msg .chat .get_messages ()) == 3
1110
1110
1111
1111
1112
- def test_prefer_encrypt (acfactory , lp ):
1113
- """Test quorum rule for encryption preference in 1:1 and group chat."""
1114
- ac1 = acfactory .new_online_configuring_account (fix_is_chatmail = True )
1115
- ac2 = acfactory .new_online_configuring_account (fix_is_chatmail = True )
1116
- ac3 = acfactory .new_online_configuring_account (fix_is_chatmail = True )
1117
- acfactory .bring_accounts_online ()
1118
- ac1 .set_config ("e2ee_enabled" , "0" )
1119
- ac2 .set_config ("e2ee_enabled" , "1" )
1120
- ac3 .set_config ("e2ee_enabled" , "0" )
1121
-
1122
- # Make sure we do not send a copy to ourselves. This is to
1123
- # test that we count own preference even when we are not in
1124
- # the recipient list.
1125
- ac1 .set_config ("bcc_self" , "0" )
1126
- ac2 .set_config ("bcc_self" , "0" )
1127
- ac3 .set_config ("bcc_self" , "0" )
1128
-
1129
- acfactory .introduce_each_other ([ac1 , ac2 , ac3 ])
1130
-
1131
- lp .sec ("ac1: sending message to ac2" )
1132
- chat1 = ac1 .create_chat (ac2 )
1133
- msg1 = chat1 .send_text ("message1" )
1134
- assert not msg1 .is_encrypted ()
1135
- ac2 ._evtracker .wait_next_incoming_message ()
1136
-
1137
- lp .sec ("ac2: sending message to ac1" )
1138
- chat2 = ac2 .create_chat (ac1 )
1139
- msg2 = chat2 .send_text ("message2" )
1140
- # Own preference is `Mutual` and we have the peer's key.
1141
- assert msg2 .is_encrypted ()
1142
- ac1 ._evtracker .wait_next_incoming_message ()
1143
-
1144
- lp .sec ("ac1: sending message to group chat with ac2 and ac3" )
1145
- group = ac1 .create_group_chat ("hello" )
1146
- group .add_contact (ac2 )
1147
- group .add_contact (ac3 )
1148
- msg3 = group .send_text ("message3" )
1149
- assert not msg3 .is_encrypted ()
1150
- ac2 ._evtracker .wait_next_incoming_message ()
1151
- ac3 ._evtracker .wait_next_incoming_message ()
1152
-
1153
- lp .sec ("ac3: start preferring encryption and inform ac1" )
1154
- ac3 .set_config ("e2ee_enabled" , "1" )
1155
- chat3 = ac3 .create_chat (ac1 )
1156
- msg4 = chat3 .send_text ("message4" )
1157
- # Own preference is `Mutual` and we have the peer's key.
1158
- assert msg4 .is_encrypted ()
1159
- ac1 ._evtracker .wait_next_incoming_message ()
1160
-
1161
- lp .sec ("ac1: sending another message to group chat with ac2 and ac3" )
1162
- msg5 = group .send_text ("message5" )
1163
- # Majority prefers encryption now
1164
- assert msg5 .is_encrypted ()
1165
-
1166
-
1167
1112
def test_bot (acfactory , lp ):
1168
1113
"""Test that bot messages can be identified as such"""
1169
1114
ac1 , ac2 = acfactory .get_online_accounts (2 )
0 commit comments