@@ -259,11 +259,10 @@ def test_trusted_relays_info(self) -> None:
259259
260260 data = {"trustedRelays" : trusted_relays }
261261
262- with self .feature ("organizations:relay" ):
263- start_time = timezone .now ()
264- self .get_success_response (self .organization .slug , method = "put" , ** data )
265- end_time = timezone .now ()
266- response = self .get_success_response (self .organization .slug )
262+ start_time = timezone .now ()
263+ self .get_success_response (self .organization .slug , method = "put" , ** data )
264+ end_time = timezone .now ()
265+ response = self .get_success_response (self .organization .slug )
267266
268267 response_data = response .data .get ("trustedRelays" )
269268
@@ -886,19 +885,6 @@ def test_setting_codecov_without_paid_plan_forbidden(self) -> None:
886885 data = {"codecovAccess" : True }
887886 self .get_error_response (self .organization .slug , status_code = 403 , ** data )
888887
889- def test_setting_trusted_relays_forbidden (self ) -> None :
890- data = {
891- "trustedRelays" : [
892- {"publicKey" : _VALID_RELAY_KEYS [0 ], "name" : "name1" },
893- {"publicKey" : _VALID_RELAY_KEYS [1 ], "name" : "name2" },
894- ]
895- }
896-
897- with self .feature ({"organizations:relay" : False }):
898- response = self .get_error_response (self .organization .slug , status_code = 400 , ** data )
899-
900- assert b"feature" in response .content
901-
902888 def test_setting_duplicate_trusted_keys (self ) -> None :
903889 """
904890 Test that you cannot set duplicated keys
@@ -928,8 +914,7 @@ def test_setting_duplicate_trusted_keys(self) -> None:
928914
929915 data = {"trustedRelays" : trusted_relays }
930916
931- with self .feature ("organizations:relay" ):
932- response = self .get_error_response (self .organization .slug , status_code = 400 , ** data )
917+ response = self .get_error_response (self .organization .slug , status_code = 400 , ** data )
933918
934919 response_data = response .data .get ("trustedRelays" )
935920 assert response_data is not None
@@ -956,7 +941,7 @@ def test_creating_trusted_relays(self) -> None:
956941
957942 data = {"trustedRelays" : trusted_relays }
958943
959- with self . feature ( "organizations:relay" ), outbox_runner ():
944+ with outbox_runner ():
960945 start_time = timezone .now ()
961946 response = self .get_success_response (self .organization .slug , ** data )
962947 end_time = timezone .now ()
@@ -1040,7 +1025,7 @@ def test_modifying_trusted_relays(self) -> None:
10401025 initial_settings = {"trustedRelays" : initial_trusted_relays }
10411026 changed_settings = {"trustedRelays" : modified_trusted_relays }
10421027
1043- with self . feature ( "organizations:relay" ), outbox_runner ():
1028+ with outbox_runner ():
10441029 start_time = timezone .now ()
10451030 self .get_success_response (self .organization .slug , ** initial_settings )
10461031 after_initial = timezone .now ()
@@ -1108,9 +1093,8 @@ def test_deleting_trusted_relays(self) -> None:
11081093 initial_settings = {"trustedRelays" : initial_trusted_relays }
11091094 changed_settings : dict [str , Any ] = {"trustedRelays" : []}
11101095
1111- with self .feature ("organizations:relay" ):
1112- self .get_success_response (self .organization .slug , ** initial_settings )
1113- response = self .get_success_response (self .organization .slug , ** changed_settings )
1096+ self .get_success_response (self .organization .slug , ** initial_settings )
1097+ response = self .get_success_response (self .organization .slug , ** changed_settings )
11141098
11151099 response_data = response .data .get ("trustedRelays" )
11161100
0 commit comments