Scope generated test files to gen package rather than test.gen

Author: lukasbindreiter

Makefile

@@ -45,10 +45,10 @@ generate-protobuf-tests: $(BIN)/buf ## Regenerate protobuf gencode used in unit
 
 	# generate cel-spec into test/gen/cel/expr
 	$(BIN)/buf generate buf.build/google/cel-spec:$(CEL_SPEC_VERSION) --exclude-path cel/expr/conformance/proto2 --exclude-path cel/expr/conformance/proto3
-	# we need to update the `from cel.expr` imports in those generated files to `from test.gen.cel.expr`
-	LC_ALL=C find test/gen/cel -type f -exec sed -i.bak 's/from cel.expr/from test.gen.cel.expr/g' {} + && find test/gen/cel -name '*.bak' -delete
+	# we need to update the `from cel.expr` imports in those generated files to `from gen.cel.expr`
+	LC_ALL=C find test/gen/cel -type f -exec sed -i.bak 's/from cel.expr/from gen.cel.expr/g' {} + && find test/gen/cel -name '*.bak' -delete
 	# also update buf.validate.conformance imports
-	LC_ALL=C find test/gen/buf/validate/conformance -type f -exec sed -i.bak 's/from buf.validate.conformance/from test.gen.buf.validate.conformance/g' {} + && find test/gen/buf/validate/conformance -name '*.bak' -delete
+	LC_ALL=C find test/gen/buf/validate/conformance -type f -exec sed -i.bak 's/from buf.validate.conformance/from gen.buf.validate.conformance/g' {} + && find test/gen/buf/validate/conformance -name '*.bak' -delete
 
 	# generate proto/tests/example/v1/validations.proto into test/gen/tests/example/v1
 	$(BIN)/buf generate

test/conftest.py

@@ -0,0 +1,20 @@
+# Copyright 2023-2025 Buf Technologies, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import sys
+from pathlib import Path
+
+test_dir_path = Path(__file__).parent.absolute().as_posix()
+if test_dir_path not in sys.path:
+    sys.path.append(test_dir_path)

test/gen/buf/validate/conformance/cases/enums_pb2.py

@@ -26,8 +26,8 @@
 _sym_db = _symbol_database.Default()
 
 
-from test.gen.buf.validate.conformance.cases.other_package import embed_pb2 as buf_dot_validate_dot_conformance_dot_cases_dot_other__package_dot_embed__pb2
-from test.gen.buf.validate.conformance.cases.yet_another_package import embed2_pb2 as buf_dot_validate_dot_conformance_dot_cases_dot_yet__another__package_dot_embed2__pb2
+from gen.buf.validate.conformance.cases.other_package import embed_pb2 as buf_dot_validate_dot_conformance_dot_cases_dot_other__package_dot_embed__pb2
+from gen.buf.validate.conformance.cases.yet_another_package import embed2_pb2 as buf_dot_validate_dot_conformance_dot_cases_dot_yet__another__package_dot_embed2__pb2
 from buf.validate import validate_pb2 as buf_dot_validate_dot_validate__pb2
 
 

test/gen/buf/validate/conformance/cases/enums_pb2.pyi

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test.gen.buf.validate.conformance.cases.other_package import embed_pb2 as _embed_pb2
-from test.gen.buf.validate.conformance.cases.yet_another_package import embed2_pb2 as _embed2_pb2
+from gen.buf.validate.conformance.cases.other_package import embed_pb2 as _embed_pb2
+from gen.buf.validate.conformance.cases.yet_another_package import embed2_pb2 as _embed2_pb2
 from buf.validate import validate_pb2 as _validate_pb2
 from google.protobuf.internal import containers as _containers
 from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper

test/gen/buf/validate/conformance/cases/messages_pb2.py

@@ -26,7 +26,7 @@
 _sym_db = _symbol_database.Default()
 
 
-from test.gen.buf.validate.conformance.cases.other_package import embed_pb2 as buf_dot_validate_dot_conformance_dot_cases_dot_other__package_dot_embed__pb2
+from gen.buf.validate.conformance.cases.other_package import embed_pb2 as buf_dot_validate_dot_conformance_dot_cases_dot_other__package_dot_embed__pb2
 from buf.validate import validate_pb2 as buf_dot_validate_dot_validate__pb2
 
 

test/gen/buf/validate/conformance/cases/messages_pb2.pyi

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test.gen.buf.validate.conformance.cases.other_package import embed_pb2 as _embed_pb2
+from gen.buf.validate.conformance.cases.other_package import embed_pb2 as _embed_pb2
 from buf.validate import validate_pb2 as _validate_pb2
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message

test/gen/buf/validate/conformance/cases/predefined_rules_proto3_pb2.py

@@ -26,8 +26,8 @@
 _sym_db = _symbol_database.Default()
 
 
-from test.gen.buf.validate.conformance.cases import predefined_rules_proto2_pb2 as buf_dot_validate_dot_conformance_dot_cases_dot_predefined__rules__proto2__pb2
-from test.gen.buf.validate.conformance.cases import predefined_rules_proto_editions_pb2 as buf_dot_validate_dot_conformance_dot_cases_dot_predefined__rules__proto__editions__pb2
+from gen.buf.validate.conformance.cases import predefined_rules_proto2_pb2 as buf_dot_validate_dot_conformance_dot_cases_dot_predefined__rules__proto2__pb2
+from gen.buf.validate.conformance.cases import predefined_rules_proto_editions_pb2 as buf_dot_validate_dot_conformance_dot_cases_dot_predefined__rules__proto__editions__pb2
 from buf.validate import validate_pb2 as buf_dot_validate_dot_validate__pb2
 from google.protobuf import duration_pb2 as google_dot_protobuf_dot_duration__pb2
 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2

test/gen/buf/validate/conformance/cases/predefined_rules_proto3_pb2.pyi

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test.gen.buf.validate.conformance.cases import predefined_rules_proto2_pb2 as _predefined_rules_proto2_pb2
-from test.gen.buf.validate.conformance.cases import predefined_rules_proto_editions_pb2 as _predefined_rules_proto_editions_pb2
+from gen.buf.validate.conformance.cases import predefined_rules_proto2_pb2 as _predefined_rules_proto2_pb2
+from gen.buf.validate.conformance.cases import predefined_rules_proto_editions_pb2 as _predefined_rules_proto_editions_pb2
 from buf.validate import validate_pb2 as _validate_pb2
 from google.protobuf import duration_pb2 as _duration_pb2
 from google.protobuf import timestamp_pb2 as _timestamp_pb2

test/gen/buf/validate/conformance/cases/repeated_pb2.py

@@ -26,7 +26,7 @@
 _sym_db = _symbol_database.Default()
 
 
-from test.gen.buf.validate.conformance.cases.other_package import embed_pb2 as buf_dot_validate_dot_conformance_dot_cases_dot_other__package_dot_embed__pb2
+from gen.buf.validate.conformance.cases.other_package import embed_pb2 as buf_dot_validate_dot_conformance_dot_cases_dot_other__package_dot_embed__pb2
 from buf.validate import validate_pb2 as buf_dot_validate_dot_validate__pb2
 from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2
 from google.protobuf import duration_pb2 as google_dot_protobuf_dot_duration__pb2

test/gen/buf/validate/conformance/cases/repeated_pb2.pyi

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from test.gen.buf.validate.conformance.cases.other_package import embed_pb2 as _embed_pb2
+from gen.buf.validate.conformance.cases.other_package import embed_pb2 as _embed_pb2
 from buf.validate import validate_pb2 as _validate_pb2
 from google.protobuf import any_pb2 as _any_pb2
 from google.protobuf import duration_pb2 as _duration_pb2