Skip to content

Commit 69f95f2

Browse files
committed
feat grpc: add test for issue from #1014
Tests: протестировано локально и в CI commit_hash:4c76245dce6da4ba97a76268ffae6dd6f16caa49
1 parent d24908a commit 69f95f2

File tree

5 files changed

+58
-1
lines changed

5 files changed

+58
-1
lines changed

.mapping.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2056,6 +2056,9 @@
20562056
"grpc/functional_tests/basic_server/tests-unix-socket/conftest.py":"taxi/uservices/userver/grpc/functional_tests/basic_server/tests-unix-socket/conftest.py",
20572057
"grpc/functional_tests/basic_server/tests-unix-socket/test_grpc.py":"taxi/uservices/userver/grpc/functional_tests/basic_server/tests-unix-socket/test_grpc.py",
20582058
"grpc/functional_tests/basic_server/tests-unix-socket/test_header_propagation.py":"taxi/uservices/userver/grpc/functional_tests/basic_server/tests-unix-socket/test_header_propagation.py",
2059+
"grpc/functional_tests/basic_server/unused_proto/CMakeLists.txt":"taxi/uservices/userver/grpc/functional_tests/basic_server/unused_proto/CMakeLists.txt",
2060+
"grpc/functional_tests/basic_server/unused_proto/proto/samples/unused.proto":"taxi/uservices/userver/grpc/functional_tests/basic_server/unused_proto/proto/samples/unused.proto",
2061+
"grpc/functional_tests/basic_server/unused_proto/proto/ya.make":"taxi/uservices/userver/grpc/functional_tests/basic_server/unused_proto/proto/ya.make",
20592062
"grpc/functional_tests/lowlevel/CMakeLists.txt":"taxi/uservices/userver/grpc/functional_tests/lowlevel/CMakeLists.txt",
20602063
"grpc/functional_tests/lowlevel/main.cpp":"taxi/uservices/userver/grpc/functional_tests/lowlevel/main.cpp",
20612064
"grpc/functional_tests/lowlevel/proto/samples/greeter.proto":"taxi/uservices/userver/grpc/functional_tests/lowlevel/proto/samples/greeter.proto",

grpc/functional_tests/basic_server/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ target_link_libraries(${PROJECT_NAME} userver::core)
55

66
include(UserverGrpcTargets)
77
userver_add_grpc_library(${PROJECT_NAME}-proto PROTOS samples/greeter.proto)
8-
target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}-proto)
8+
add_subdirectory(unused_proto) # Test for https://github.com/userver-framework/userver/pull/1014
9+
target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}-proto ${PROJECT_NAME}-unused-proto)
910

1011
userver_chaos_testsuite_add(TESTS_DIRECTORY tests-tls)
1112
userver_chaos_testsuite_add(TESTS_DIRECTORY tests-unix-socket)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include(UserverGrpcTargets)
2+
userver_add_grpc_library(${PROJECT_NAME}-unused-proto PROTOS samples/unused.proto)
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
syntax = "proto3";
2+
3+
package unused.api;
4+
5+
service GreeterService {
6+
rpc SayHello(GreetingRequest) returns(GreetingResponse) {}
7+
rpc CallEchoNobody(GreetingRequest) returns(GreetingResponse) {}
8+
}
9+
10+
message GreetingRequest {
11+
string name = 1;
12+
}
13+
14+
message GreetingResponse {
15+
string greeting = 1;
16+
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
PROTO_LIBRARY(userver-functional-test-service-grpc-unused-proto)
2+
3+
SUBSCRIBER(g:taxi-common)
4+
5+
EXCLUDE_TAGS(GO_PROTO JAVA_PROTO)
6+
7+
SRCDIR(taxi/uservices/userver/grpc/functional_tests/basic_server/unused_proto/proto)
8+
9+
SRCS(
10+
samples/unused.proto
11+
)
12+
13+
PROTO_NAMESPACE(taxi/uservices/userver/grpc/functional_tests/basic_server/unused_proto/proto)
14+
PY_NAMESPACE(.)
15+
16+
GRPC()
17+
18+
CPP_PROTO_PLUGIN2(
19+
usrv_service
20+
taxi/uservices/userver-arc-utils/scripts/grpc/arc-generate-service
21+
_service.usrv.pb.hpp
22+
_service.usrv.pb.cpp
23+
DEPS taxi/uservices/userver/grpc
24+
)
25+
CPP_PROTO_PLUGIN2(
26+
usrv_client
27+
taxi/uservices/userver-arc-utils/scripts/grpc/arc-generate-client
28+
_client.usrv.pb.hpp
29+
_client.usrv.pb.cpp
30+
DEPS taxi/uservices/userver/grpc
31+
)
32+
33+
END()
34+
35+

0 commit comments

Comments
 (0)