test input: use explicit package declaration (#345)

Author: abn

.github/workflows/ci.yml

@@ -13,6 +13,7 @@ jobs:
     name: ${{ matrix.os }} / ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}-latest
     strategy:
+      fail-fast: false
       matrix:
         os: [Ubuntu, MacOS, Windows]
         python-version: ['3.6.7', '3.7', '3.8', '3.9', '3.10']
@@ -56,9 +57,7 @@ jobs:
 
       - name: Install dependencies
         shell: bash
-        run: |
-          poetry run python -m pip install pip -U
-          poetry install
+        run: poetry install
 
       - name: Generate code from proto files
         shell: bash

tests/conftest.py

@@ -1,3 +1,6 @@
+import copy
+import sys
+
 import pytest
 
 
@@ -10,3 +13,10 @@ def pytest_addoption(parser):
 @pytest.fixture(scope="session")
 def repeat(request):
     return request.config.getoption("repeat")
+
+
+@pytest.fixture
+def reset_sys_path():
+    original = copy.deepcopy(sys.path)
+    yield
+    sys.path = original

tests/generate.py

@@ -78,7 +78,7 @@ async def generate_test_case_output(
     """
 
     test_case_output_path_reference = output_path_reference.joinpath(test_case_name)
-    test_case_output_path_betterproto = output_path_betterproto.joinpath(test_case_name)
+    test_case_output_path_betterproto = output_path_betterproto
 
     os.makedirs(test_case_output_path_reference, exist_ok=True)
     os.makedirs(test_case_output_path_betterproto, exist_ok=True)

tests/grpc/test_grpclib_client.py

@@ -7,12 +7,12 @@
 import pytest
 from betterproto.grpc.util.async_channel import AsyncChannel
 from grpclib.testing import ChannelFor
-from tests.output_betterproto.service.service import (
+from tests.output_betterproto.service import (
     DoThingRequest,
     DoThingResponse,
     GetThingRequest,
 )
-from tests.output_betterproto.service.service import TestStub as ThingServiceClient
+from tests.output_betterproto.service import TestStub as ThingServiceClient
 
 from .thing_service import ThingService
 

tests/grpc/thing_service.py

@@ -1,4 +1,4 @@
-from tests.output_betterproto.service.service import (
+from tests.output_betterproto.service import (
     DoThingResponse,
     DoThingRequest,
     GetThingRequest,

tests/inputs/bool/bool.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package bool;
+
 message Test {
     bool value = 1;
 }

tests/inputs/bytes/bytes.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package bytes;
+
 message Test {
     bytes data = 1;
 }

tests/inputs/casing/casing.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package casing;
+
 enum my_enum {
   ZERO = 0;
   ONE = 1;

tests/inputs/casing_message_field_uppercase/casing_message_field_uppercase.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package casing_message_field_uppercase;
+
 message Test {
   int32 UPPERCASE = 1;
   int32 UPPERCASE_V2 = 2;

tests/inputs/deprecated/deprecated.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+package deprecated;
+
 // Some documentation about the Test message.
 message Test {
     // Some documentation about the value.