cc grpc: move tests not requiring chaos gate outside chaos

commit_hash:81cf43e5b2d380a224cb41f1c69f7a88f40fca58

Author: Anton3

.mapping.json

@@ -2115,7 +2115,9 @@
   "grpc/functional_tests/basic_chaos/tests-grpcserver/test_network_smaller_parts.py":"taxi/uservices/userver/grpc/functional_tests/basic_chaos/tests-grpcserver/test_network_smaller_parts.py",
   "grpc/functional_tests/basic_chaos/tests-grpcserver/test_server_client_bytes.py":"taxi/uservices/userver/grpc/functional_tests/basic_chaos/tests-grpcserver/test_server_client_bytes.py",
   "grpc/functional_tests/basic_chaos/tests-grpcserver/test_server_smaller_parts.py":"taxi/uservices/userver/grpc/functional_tests/basic_chaos/tests-grpcserver/test_server_smaller_parts.py",
-  "grpc/functional_tests/basic_chaos/tests-grpcserver/test_tracing_metadata.py":"taxi/uservices/userver/grpc/functional_tests/basic_chaos/tests-grpcserver/test_tracing_metadata.py",
+  "grpc/functional_tests/basic_chaos/tests-nonchaos/conftest.py":"taxi/uservices/userver/grpc/functional_tests/basic_chaos/tests-nonchaos/conftest.py",
+  "grpc/functional_tests/basic_chaos/tests-nonchaos/test_basic.py":"taxi/uservices/userver/grpc/functional_tests/basic_chaos/tests-nonchaos/test_basic.py",
+  "grpc/functional_tests/basic_chaos/tests-nonchaos/test_tracing_metadata.py":"taxi/uservices/userver/grpc/functional_tests/basic_chaos/tests-nonchaos/test_tracing_metadata.py",
   "grpc/functional_tests/basic_server/CMakeLists.txt":"taxi/uservices/userver/grpc/functional_tests/basic_server/CMakeLists.txt",
   "grpc/functional_tests/basic_server/grpc_service.cpp":"taxi/uservices/userver/grpc/functional_tests/basic_server/grpc_service.cpp",
   "grpc/functional_tests/basic_server/proto/samples/greeter.proto":"taxi/uservices/userver/grpc/functional_tests/basic_server/proto/samples/greeter.proto",

grpc/functional_tests/basic_chaos/CMakeLists.txt

@@ -9,3 +9,5 @@ target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}-proto)
 userver_chaos_testsuite_add(TESTS_DIRECTORY tests-grpcserver)
 
 userver_chaos_testsuite_add(TESTS_DIRECTORY tests-grpcclient)
+
+userver_chaos_testsuite_add(TESTS_DIRECTORY tests-nonchaos)

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

@@ -1,56 +1,7 @@
-import grpc
 import pytest
 import requests_server
 
-import samples.greeter_pb2 as greeter_pb2  # noqa: E402, E501
-
 
 @pytest.mark.parametrize('case', requests_server.ALL_CASES)
 async def test_basic(grpc_client, gate, case):
     await requests_server.check_ok_for(case, grpc_client, gate)
-
-
-async def test_grpc_cc_enabled(grpc_client, service_client, testpoint):
-    @testpoint('congestion-control')
-    def tp_cc_enable(data):
-        return {'force-rps-limit': 0}
-
-    @testpoint('congestion-control-apply')
-    def tp_cc_apply(data):
-        return {}
-
-    # wait until server obtains the new limit, up to 1 second
-    await service_client.enable_testpoints()
-    await tp_cc_enable.wait_call()
-    await tp_cc_apply.wait_call()
-
-    # Random non-ping handler is throttled
-    with pytest.raises(grpc.RpcError) as error:
-        request = greeter_pb2.GreetingRequest(name='Python')
-        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
-
-    # A hack to disable CC for other tests
-    @testpoint('congestion-control')
-    def tp_cc_disable(data):
-        return {}
-
-    await tp_cc_disable.wait_call()
-    await tp_cc_apply.wait_call()
-
-
-async def test_grpc_cancellation(grpc_client, service_client, testpoint):
-    @testpoint('testpoint_cancel')
-    def cancel_testpoint(data):
-        pass
-
-    await service_client.enable_testpoints()
-
-    with pytest.raises(grpc.RpcError) as error:
-        request = greeter_pb2.GreetingRequest(name='test_payload_cancellation')
-        await grpc_client.SayHello(request, wait_for_ready=True, timeout=0.1)
-    assert error.value.details() == 'Deadline Exceeded'
-    assert error.value.code() == grpc.StatusCode.DEADLINE_EXCEEDED
-
-    await cancel_testpoint.wait_call()

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

@@ -0,0 +1,10 @@
+import pytest
+
+import samples.greeter_pb2_grpc as greeter_pb2_grpc
+
+pytest_plugins = ['pytest_userver.plugins.grpc']
+
+
+@pytest.fixture
+def grpc_client(grpc_channel):
+    return greeter_pb2_grpc.GreeterServiceStub(grpc_channel)

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

@@ -0,0 +1,50 @@
+import grpc
+import pytest
+
+import samples.greeter_pb2 as greeter_pb2
+
+
+async def test_grpc_cc_enabled(grpc_client, service_client, testpoint):
+    @testpoint('congestion-control')
+    def tp_cc_enable(data):
+        return {'force-rps-limit': 0}
+
+    @testpoint('congestion-control-apply')
+    def tp_cc_apply(data):
+        return {}
+
+    # wait until server obtains the new limit, up to 1 second
+    await service_client.enable_testpoints()
+    await tp_cc_enable.wait_call()
+    await tp_cc_apply.wait_call()
+
+    # Random non-ping handler is throttled
+    with pytest.raises(grpc.RpcError) as error:
+        request = greeter_pb2.GreetingRequest(name='Python')
+        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
+
+    # A hack to disable CC for other tests
+    @testpoint('congestion-control')
+    def tp_cc_disable(data):
+        return {}
+
+    await tp_cc_disable.wait_call()
+    await tp_cc_apply.wait_call()
+
+
+async def test_grpc_cancellation(grpc_client, service_client, testpoint):
+    @testpoint('testpoint_cancel')
+    def cancel_testpoint(data):
+        pass
+
+    await service_client.enable_testpoints()
+
+    with pytest.raises(grpc.RpcError) as error:
+        request = greeter_pb2.GreetingRequest(name='test_payload_cancellation')
+        await grpc_client.SayHello(request, wait_for_ready=True, timeout=0.1)
+    assert error.value.details() == 'Deadline Exceeded'
+    assert error.value.code() == grpc.StatusCode.DEADLINE_EXCEEDED
+
+    await cancel_testpoint.wait_call()

…ests-grpcserver/test_tracing_metadata.py …/tests-nonchaos/test_tracing_metadata.pygrpc/functional_tests/basic_chaos/tests-grpcserver/test_tracing_metadata.py renamed to grpc/functional_tests/basic_chaos/tests-nonchaos/test_tracing_metadata.py grpc/functional_tests/basic_chaos/tests-grpcserver/test_tracing_metadata.py renamed to grpc/functional_tests/basic_chaos/tests-nonchaos/test_tracing_metadata.py

@@ -1,10 +1,10 @@
 import pytest
 
-import samples.greeter_pb2 as greeter_pb2  # noqa: E402, E501
+import samples.greeter_pb2 as greeter_pb2
 
 
 @pytest.mark.parametrize(
-    'metadata,logs,',
+    'metadata,logs',
     [
         [(('x-yatraceid', 'traceid'),), {'trace_id': 'traceid'}],
         [
@@ -21,13 +21,7 @@
         ],
     ],
 )
-async def test_tracing_metadata(
-    grpc_client,
-    service_client,
-    gate,
-    metadata,
-    logs,
-):
+async def test_tracing_metadata(grpc_client, service_client, metadata, logs):
     request = greeter_pb2.GreetingRequest(name='Python')
     async with service_client.capture_logs() as capture:
         response = await grpc_client.SayHello(