Make tests more independant (#116)

* Add ignore_unknown_fields parameter

* Add .gitignore

* Remove .gitignore

* Improve test generation

* Fix poe commands

* Fix first tests

* Fix more tests

* Fix more tests

* Fix import

* Fix workflow

* Fix any test

* Fix features test

* Fix grpclib reflection test

* Add missing tests

* Fix service uppercase test

* Fix stream_stream

* Fix message enum descriptors

* Fix casing

* Fix nested twice

* Fix more tests

* Fix more tests

* Fix more tests

* Fix more tests

* Fix more tests

* Delete useless tests

* Remove useless import

* Fix first input tests

* Fix more tests

* Fix more tests

* Add remaining tests

* Disable ruff warning

* Remove comments

Author: AdrienVannson

.github/workflows/ci.yml

@@ -49,7 +49,7 @@ jobs:
 
       - name: Move compiled files to betterproto2
         shell: bash
-        run: mv betterproto2_compiler/tests/output_betterproto betterproto2_compiler/tests/output_betterproto_pydantic betterproto2_compiler/tests/output_betterproto_descriptor betterproto2_compiler/tests/output_reference betterproto2/tests
+        run: cp -r betterproto2_compiler/tests/outputs betterproto2/tests
 
       - name: Execute test suite
         working-directory: ./betterproto2

.gitignore

@@ -7,6 +7,7 @@
 .python-version
 build/
 */tests/output_*
+*/tests/outputs/*
 **/__pycache__
 dist
 **/*.egg-info
@@ -18,4 +19,4 @@ output
 .asv
 venv
 .devcontainer
-.ruff_cache
+.ruff_cache

betterproto2/pyproject.toml

@@ -92,7 +92,7 @@ addopts = "-p no:warnings"
 # Dev workflow tasks
 [tool.poe.tasks.get-local-compiled-tests]
 # task useful for local development. Copies the compiled test files from the compiler folder to the tests folder
-shell = "rm -rf tests/output_* && cp -r ../betterproto2_compiler/tests/output_* tests"
+shell = "rm -rf tests/outputs* && cp -r ../betterproto2_compiler/tests/outputs tests"
 
 [tool.poe.tasks.test]
 cmd = "pytest"
@@ -138,18 +138,6 @@ rm -rf .coverage .mypy_cache .pytest_cache
 """
 help = "Clean out generated files from the workspace"
 
-[tool.poe.tasks.pull-compiled-tests]
-shell  = """
-rm -rf tests/output_* &&
-git clone https://github.com/betterproto/python-betterproto2-compiler --branch compiled-test-files --single-branch compiled_files &&
-mv compiled_files/tests_betterproto tests/output_betterproto &&
-mv compiled_files/tests_betterproto_pydantic tests/output_betterproto_pydantic &&
-mv compiled_files/tests_betterproto_pydantic tests/output_betterproto_descriptor &&
-mv compiled_files/tests_reference tests/output_reference &&
-rm -rf compiled_files
-"""
-help = "Pulls the compiled test files from the betterproto2-compiler repository"
-
 [tool.poe.tasks.serve-docs]
 cmd = "mkdocs serve"
 help = "Serve the documentation locally"

betterproto2/tests/grpc/test_grpclib_client.py

@@ -9,7 +9,7 @@
 from grpclib.testing import ChannelFor
 
 from tests.grpc.async_channel import AsyncChannel
-from tests.output_betterproto.service import (
+from tests.outputs.service.service import (
     DoThingRequest,
     DoThingResponse,
     GetThingRequest,

betterproto2/tests/grpc/test_grpclib_reflection.py

@@ -8,15 +8,17 @@
 from grpclib.reflection.v1alpha.reflection_grpc import ServerReflectionBase as ServerReflectionBaseV1Alpha
 from grpclib.testing import ChannelFor
 
-from tests.output_betterproto.example_service import TestBase
-from tests.output_betterproto.grpc.reflection.v1 import (
+from tests.outputs.grpclib_reflection.example_service import TestBase
+from tests.outputs.grpclib_reflection.grpc.reflection.v1 import (
     ErrorResponse,
     ListServiceResponse,
     ServerReflectionRequest,
     ServerReflectionStub,
     ServiceResponse,
 )
-from tests.output_betterproto_descriptor.google_proto_descriptor_pool import default_google_proto_descriptor_pool
+from tests.outputs.grpclib_reflection_descriptors.google_proto_descriptor_pool import (
+    default_google_proto_descriptor_pool,
+)
 
 
 class TestService(TestBase):
@@ -78,7 +80,7 @@ async def test_grpclib_reflection():
         assert response.file_descriptor_response is None
 
         # now it should work
-        import tests.output_betterproto_descriptor.example_service as example_service_with_desc
+        import tests.outputs.grpclib_reflection_descriptors.example_service as example_service_with_desc
 
         requests.put(ServerReflectionRequest(file_containing_symbol="example_service.Test"))
         response = await anext(responses)

betterproto2/tests/grpc/test_message_enum_descriptors.py

@@ -1,10 +1,14 @@
 import pytest
 
-from tests.output_betterproto.import_cousin_package_same_name.test.subpackage import Test
+from tests.outputs.import_cousin_package_same_name.import_cousin_package_same_name.test.subpackage import Test
 
 # importing the cousin should cause no descriptor pool errors since the subpackage imports it once already
-from tests.output_betterproto_descriptor.import_cousin_package_same_name.cousin.subpackage import CousinMessage
-from tests.output_betterproto_descriptor.import_cousin_package_same_name.test.subpackage import Test as TestWithDesc
+from tests.outputs.import_cousin_package_same_name_descriptors.import_cousin_package_same_name.cousin.subpackage import (  # noqa: E501
+    CousinMessage,
+)
+from tests.outputs.import_cousin_package_same_name_descriptors.import_cousin_package_same_name.test.subpackage import (
+    Test as TestWithDesc,
+)
 
 
 def test_message_enum_descriptors():

betterproto2/tests/grpc/test_stream_stream.py

@@ -4,7 +4,7 @@
 import pytest
 
 from tests.grpc.async_channel import AsyncChannel
-from tests.output_betterproto.stream_stream import Message
+from tests.outputs.stream_stream.stream_stream import Message
 
 
 @pytest.fixture

betterproto2/tests/grpc/thing_service.py

@@ -1,7 +1,7 @@
 import grpclib
 import grpclib.server
 
-from tests.output_betterproto.service import (
+from tests.outputs.service.service import (
     DoThingRequest,
     DoThingResponse,
     GetThingRequest,

betterproto2/tests/inputs/bool/test_bool.py

@@ -2,28 +2,28 @@
 
 
 def test_value():
-    from tests.output_betterproto.bool import Test
+    from tests.outputs.bool.bool import Test
 
     message = Test()
     assert not message.value, "Boolean is False by default"
 
 
 def test_pydantic_no_value():
-    from tests.output_betterproto_pydantic.bool import Test as TestPyd
+    from tests.outputs.bool_pydantic.bool import Test as TestPyd
 
     message = TestPyd()
     assert not message.value, "Boolean is False by default"
 
 
 def test_pydantic_value():
-    from tests.output_betterproto_pydantic.bool import Test as TestPyd
+    from tests.outputs.bool_pydantic.bool import Test as TestPyd
 
     message = TestPyd(value=False)
     assert not message.value
 
 
 def test_pydantic_bad_value():
-    from tests.output_betterproto_pydantic.bool import Test as TestPyd
+    from tests.outputs.bool_pydantic.bool import Test as TestPyd
 
     with pytest.raises(ValueError):
         TestPyd(value=123)

betterproto2/tests/inputs/casing/test_casing.py

@@ -1,5 +1,5 @@
-import tests.output_betterproto.casing as casing
-from tests.output_betterproto.casing import Test
+import tests.outputs.casing.casing as casing
+from tests.outputs.casing.casing import Test
 
 
 def test_message_attributes():