fix grpc: fix race in congestion control tests

commit_hash:91a0bc6c6788acb67f344314a10f12408db03796

Author: kpavlov00

grpc/functional_tests/basic_chaos/tests-nonchaos/test_basic.py

@@ -17,9 +17,11 @@ def tp_congestion_control(data):
     def tp_congestion_control_apply(data):
         return {}
 
-    # wait until server obtains the new limit, up to 1 second
     await service_client.enable_testpoints()
+
+    # wait until server obtains the new limit, up to 1 second
     await tp_congestion_control.wait_call()
+    await tp_congestion_control_apply.wait_call()
 
     # Random non-ping handler is throttled
     with pytest.raises(grpc.RpcError) as error:
@@ -34,6 +36,7 @@ def tp_congestion_control_disable(data):
         return {'force-rps-limit': None}
 
     await tp_congestion_control_disable.wait_call()
+    await tp_congestion_control_apply.wait_call()
 
 
 async def test_grpc_congestion_control_activate(grpc_client, service_client, testpoint):
@@ -53,18 +56,21 @@ def tp_congestion_control(data):
     def tp_congestion_control_apply(data):
         return {}
 
-    # is_overloaded -> true
     await service_client.enable_testpoints()
+
+    # is_overloaded -> true
     await tp_congestion_control_sensor.wait_call()
     await tp_congestion_control.wait_call()
+    await tp_congestion_control_apply.wait_call()
 
     # current_limit -> 1
     await tp_congestion_control_sensor.wait_call()
     await tp_congestion_control.wait_call()
+    await tp_congestion_control_apply.wait_call()
 
     with pytest.raises(grpc.RpcError) as error:
         for i in range(0, 2):
-            request = greeter_pb2.GreetingRequest(name=f'Name0{i}/1')
+            request = greeter_pb2.GreetingRequest(name=f'Name{i}/1')
             await grpc_client.SayHello(request, wait_for_ready=True)
     assert error.value.details() == 'Congestion control: rate limit exceeded'
     assert error.value.code() == grpc.StatusCode.RESOURCE_EXHAUSTED
@@ -80,10 +86,12 @@ def tp_congestion_control_sensor_disable(data):
     # current_limit -> 1
     await tp_congestion_control_sensor_disable.wait_call()
     await tp_congestion_control.wait_call()
+    await tp_congestion_control_apply.wait_call()
 
     # current_limit -> null
     await tp_congestion_control_sensor_disable.wait_call()
     await tp_congestion_control.wait_call()
+    await tp_congestion_control_apply.wait_call()
 
     for i in range(1, 10):
         request = greeter_pb2.GreetingRequest(name=f'Name{i}/2')