Skip to content

Commit 706809c

Browse files
committed
Write a test to ensure that a multi-src proto_library will have imports generated for it
1 parent 50980b1 commit 706809c

File tree

8 files changed

+48
-2
lines changed

8 files changed

+48
-2
lines changed

gazelle/python/testdata/resolves_proto_imports/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ This test asserts that Gazelle can resolve imports from `py_proto_library` targe
55
1. Generates a dependency in the default case.
66
2. Uses `gazelle:resolve` to generate dependencies.
77
3. Uses `python_proto_naming_convention` to generate dependencies.
8-
9-
[gh-1703]: https://github.com/bazel-contrib/rules_python/issues/1703
8+
4. Generates a correct dependency for a proto_library with multiple srcs.

gazelle/python/testdata/resolves_proto_imports/test4_generates_imports_for_multiple_proto_srcs/BUILD.in

Whitespace-only changes.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
load("@rules_python//python:defs.bzl", "py_library")
2+
3+
py_library(
4+
name = "test4_generates_imports_for_multiple_proto_srcs",
5+
srcs = ["bar.py"],
6+
visibility = ["//:__subpackages__"],
7+
deps = ["//test4_generates_imports_for_multiple_proto_srcs/foo:test4_generates_imports_for_multiple_proto_srcs_foo_py_pb2"],
8+
)
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import test4_generates_imports_for_multiple_proto_srcs.foo.foo_pb2
2+
import test4_generates_imports_for_multiple_proto_srcs.foo.bar_pb2
3+
4+
x = foo_pb2.Foo()
5+
y = bar_pb2.Bar()
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# gazelle:python_generate_proto true
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
load("@rules_proto//proto:defs.bzl", "proto_library")
2+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
3+
4+
# gazelle:python_generate_proto true
5+
6+
proto_library(
7+
name = "test4_generates_imports_for_multiple_proto_srcs_foo_proto",
8+
srcs = [
9+
"bar.proto",
10+
"foo.proto",
11+
],
12+
visibility = ["//visibility:public"],
13+
)
14+
15+
py_proto_library(
16+
name = "test4_generates_imports_for_multiple_proto_srcs_foo_py_pb2",
17+
visibility = ["//:__subpackages__"],
18+
deps = [":test4_generates_imports_for_multiple_proto_srcs_foo_proto"],
19+
)
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
syntax = "proto3";
2+
3+
package test4_generates_imports_for_multiple_proto_srcs.foo;
4+
5+
message Bar {
6+
bool bar = 1;
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
syntax = "proto3";
2+
3+
package test4_generates_imports_for_multiple_proto_srcs.foo;
4+
5+
message Foo {
6+
bool bar = 1;
7+
}

0 commit comments

Comments
 (0)