diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 83a8280132e9..6758b5fe2748 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -36,7 +36,7 @@ jobs: python -m pip install nox - name: Run unit tests env: - COVERAGE_FILE: .coverage-${{ matrix.python }} + COVERAGE_FILE: ${{ github.workspace }}/.coverage-${{ matrix.python }} BUILD_TYPE: presubmit TARGET_BRANCH: ${{ github.base_ref || github.event.merge_group.base_ref }} TEST_TYPE: unit @@ -46,8 +46,9 @@ jobs: - name: Upload coverage results uses: actions/upload-artifact@v4 with: - name: coverage-artifact-${{ '{{' }} matrix.python {{ '}}' }} + name: coverage-artifact-${{ matrix.python }} path: .coverage-${{ matrix.python }} + include-hidden-files: true cover: runs-on: ubuntu-latest @@ -67,20 +68,25 @@ jobs: python-version: "3.10" - name: Set number of files changes in packages directory id: packages - run: echo "::set-output name=num_files_changed::$(git diff HEAD~1 -- packages | wc -l)" + run: | + git diff HEAD~1 -- packages > /dev/null + num_files_changed=$(git diff HEAD~1 -- packages | wc -l | tr -d ' ') + echo "num_files_changed=${num_files_changed}" >> "$GITHUB_OUTPUT" - name: Install coverage - if: steps.packages.num_files_changed > 0 + if: ${{ steps.packages.outputs.num_files_changed > 0 }} run: | python -m pip install --upgrade setuptools pip wheel python -m pip install coverage - name: Download coverage results - if: ${{ steps.date.packages.num_files_changed > 0 }} + if: ${{ steps.packages.outputs.num_files_changed > 0 }} uses: actions/download-artifact@v4 with: path: .coverage-results/ - name: Report coverage results - if: ${{ steps.date.packages.num_files_changed > 0 }} + if: ${{ steps.packages.outputs.num_files_changed > 0 }} run: | find .coverage-results -type f -name '*.zip' -exec unzip {} \; coverage combine .coverage-results/**/.coverage* - coverage report --show-missing --fail-under=100 + # TODO: default to 100% coverage after gapic-generator release + # https://github.com/googleapis/google-cloud-python/issues/17459 + coverage report --show-missing --fail-under=99 diff --git a/packages/gapic-generator/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 b/packages/gapic-generator/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 index e8953eb0742e..e6ffe31a47ae 100644 --- a/packages/gapic-generator/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 +++ b/packages/gapic-generator/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 @@ -965,6 +965,9 @@ def test_{{ method_name }}_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, {{ method.paged_result_field.type.ident }}) @@ -1738,6 +1741,9 @@ def test_{{ method_name }}_rest_pager(transport: str = 'rest'): pager = client.{{ method_name }}(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + {% if method.paged_result_field.map %} assert isinstance(pager.get('a'), {{ method.paged_result_field.type.fields.get('value').ident }}) assert pager.get('h') is None diff --git a/packages/gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_macros.j2 b/packages/gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_macros.j2 index a612b9397f65..bccc38afe2a1 100644 --- a/packages/gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_macros.j2 +++ b/packages/gapic-generator/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_macros.j2 @@ -746,6 +746,9 @@ def test_{{ method_name }}_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 {% if method.paged_result_field.type.ident|string == 'struct_pb2.ListValue' %} @@ -902,6 +905,8 @@ async def test_{{ method_name }}_async_pager(): ) async_pager = await client.{{ method_name }}(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -1425,6 +1430,9 @@ def test_{{ method_name }}_rest_pager(transport: str = 'rest'): pager = client.{{ method_name }}(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + {% if method.paged_result_field.map %} assert isinstance(pager.get('a'), {{ method.paged_result_field.type.fields.get('value').ident }}) assert pager.get('h') is None diff --git a/packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py b/packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py index b6bbf1cdc830..ea110a38acc3 100755 --- a/packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py +++ b/packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py @@ -1577,6 +1577,9 @@ def test_list_assets_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, assets.Asset) @@ -1663,6 +1666,8 @@ async def test_list_assets_async_pager(): ) async_pager = await client.list_assets(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -3912,6 +3917,9 @@ def test_search_all_resources_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, assets.ResourceSearchResult) @@ -3998,6 +4006,8 @@ async def test_search_all_resources_async_pager(): ) async_pager = await client.search_all_resources(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -4431,6 +4441,9 @@ def test_search_all_iam_policies_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, assets.IamPolicySearchResult) @@ -4517,6 +4530,8 @@ async def test_search_all_iam_policies_async_pager(): ) async_pager = await client.search_all_iam_policies(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -6524,6 +6539,9 @@ def test_list_saved_queries_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, asset_service.SavedQuery) @@ -6610,6 +6628,8 @@ async def test_list_saved_queries_async_pager(): ) async_pager = await client.list_saved_queries(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -7908,6 +7928,9 @@ def test_analyze_org_policies_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, asset_service.AnalyzeOrgPoliciesResponse.OrgPolicyResult) @@ -7994,6 +8017,8 @@ async def test_analyze_org_policies_async_pager(): ) async_pager = await client.analyze_org_policies(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -8437,6 +8462,9 @@ def test_analyze_org_policy_governed_containers_pager(transport_name: str = "grp assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, asset_service.AnalyzeOrgPolicyGovernedContainersResponse.GovernedContainer) @@ -8523,6 +8551,8 @@ async def test_analyze_org_policy_governed_containers_async_pager(): ) async_pager = await client.analyze_org_policy_governed_containers(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -8966,6 +8996,9 @@ def test_analyze_org_policy_governed_assets_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, asset_service.AnalyzeOrgPolicyGovernedAssetsResponse.GovernedAsset) @@ -9052,6 +9085,8 @@ async def test_analyze_org_policy_governed_assets_async_pager(): ) async_pager = await client.analyze_org_policy_governed_assets(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -9442,6 +9477,9 @@ def test_list_assets_rest_pager(transport: str = 'rest'): pager = client.list_assets(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, assets.Asset) @@ -10616,6 +10654,9 @@ def test_search_all_resources_rest_pager(transport: str = 'rest'): pager = client.search_all_resources(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, assets.ResourceSearchResult) @@ -10848,6 +10889,9 @@ def test_search_all_iam_policies_rest_pager(transport: str = 'rest'): pager = client.search_all_iam_policies(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, assets.IamPolicySearchResult) @@ -11884,6 +11928,9 @@ def test_list_saved_queries_rest_pager(transport: str = 'rest'): pager = client.list_saved_queries(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, asset_service.SavedQuery) @@ -12581,6 +12628,9 @@ def test_analyze_org_policies_rest_pager(transport: str = 'rest'): pager = client.analyze_org_policies(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, asset_service.AnalyzeOrgPoliciesResponse.OrgPolicyResult) @@ -12826,6 +12876,9 @@ def test_analyze_org_policy_governed_containers_rest_pager(transport: str = 'res pager = client.analyze_org_policy_governed_containers(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, asset_service.AnalyzeOrgPolicyGovernedContainersResponse.GovernedContainer) @@ -13071,6 +13124,9 @@ def test_analyze_org_policy_governed_assets_rest_pager(transport: str = 'rest'): pager = client.analyze_org_policy_governed_assets(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, asset_service.AnalyzeOrgPolicyGovernedAssetsResponse.GovernedAsset) diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py b/packages/gapic-generator/tests/integration/goldens/eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py index 538dd2b2bac4..533e401eb1e7 100755 --- a/packages/gapic-generator/tests/integration/goldens/eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py +++ b/packages/gapic-generator/tests/integration/goldens/eventarc/tests/unit/gapic/eventarc_v1/test_eventarc.py @@ -1706,6 +1706,9 @@ def test_list_triggers_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, trigger.Trigger) @@ -1792,6 +1795,8 @@ async def test_list_triggers_async_pager(): ) async_pager = await client.list_triggers(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -3554,6 +3559,9 @@ def test_list_channels_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, channel.Channel) @@ -3640,6 +3648,8 @@ async def test_list_channels_async_pager(): ) async_pager = await client.list_channels(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -5361,6 +5371,9 @@ def test_list_providers_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, discovery.Provider) @@ -5447,6 +5460,8 @@ async def test_list_providers_async_pager(): ) async_pager = await client.list_providers(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -6191,6 +6206,9 @@ def test_list_channel_connections_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, channel_connection.ChannelConnection) @@ -6277,6 +6295,8 @@ async def test_list_channel_connections_async_pager(): ) async_pager = await client.list_channel_connections(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -8319,6 +8339,9 @@ def test_list_message_buses_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, message_bus.MessageBus) @@ -8405,6 +8428,8 @@ async def test_list_message_buses_async_pager(): ) async_pager = await client.list_message_buses(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -8832,6 +8857,9 @@ def test_list_message_bus_enrollments_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, str) @@ -8918,6 +8946,8 @@ async def test_list_message_bus_enrollments_async_pager(): ) async_pager = await client.list_message_bus_enrollments(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -10671,6 +10701,9 @@ def test_list_enrollments_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, enrollment.Enrollment) @@ -10757,6 +10790,8 @@ async def test_list_enrollments_async_pager(): ) async_pager = await client.list_enrollments(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -12506,6 +12541,9 @@ def test_list_pipelines_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, pipeline.Pipeline) @@ -12592,6 +12630,8 @@ async def test_list_pipelines_async_pager(): ) async_pager = await client.list_pipelines(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -14341,6 +14381,9 @@ def test_list_google_api_sources_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, google_api_source.GoogleApiSource) @@ -14427,6 +14470,8 @@ async def test_list_google_api_sources_async_pager(): ) async_pager = await client.list_google_api_sources(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -15861,6 +15906,9 @@ def test_list_triggers_rest_pager(transport: str = 'rest'): pager = client.list_triggers(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, trigger.Trigger) @@ -16703,6 +16751,9 @@ def test_list_channels_rest_pager(transport: str = 'rest'): pager = client.list_channels(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, channel.Channel) @@ -17541,6 +17592,9 @@ def test_list_providers_rest_pager(transport: str = 'rest'): pager = client.list_providers(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, discovery.Provider) @@ -17937,6 +17991,9 @@ def test_list_channel_connections_rest_pager(transport: str = 'rest'): pager = client.list_channel_connections(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, channel_connection.ChannelConnection) @@ -19013,6 +19070,9 @@ def test_list_message_buses_rest_pager(transport: str = 'rest'): pager = client.list_message_buses(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, message_bus.MessageBus) @@ -19243,6 +19303,9 @@ def test_list_message_bus_enrollments_rest_pager(transport: str = 'rest'): pager = client.list_message_bus_enrollments(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, str) @@ -20156,6 +20219,9 @@ def test_list_enrollments_rest_pager(transport: str = 'rest'): pager = client.list_enrollments(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, enrollment.Enrollment) @@ -21069,6 +21135,9 @@ def test_list_pipelines_rest_pager(transport: str = 'rest'): pager = client.list_pipelines(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, pipeline.Pipeline) @@ -21982,6 +22051,9 @@ def test_list_google_api_sources_rest_pager(transport: str = 'rest'): pager = client.list_google_api_sources(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, google_api_source.GoogleApiSource) diff --git a/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_config_service_v2.py b/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_config_service_v2.py index 57522704960d..eada5b433c55 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_config_service_v2.py +++ b/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_config_service_v2.py @@ -1323,6 +1323,9 @@ def test_list_buckets_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, logging_config.LogBucket) @@ -1409,6 +1412,8 @@ async def test_list_buckets_async_pager(): ) async_pager = await client.list_buckets(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -3493,6 +3498,9 @@ def test_list_views_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, logging_config.LogView) @@ -3579,6 +3587,8 @@ async def test_list_views_async_pager(): ) async_pager = await client.list_views(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -4926,6 +4936,9 @@ def test_list_sinks_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, logging_config.LogSink) @@ -5012,6 +5025,8 @@ async def test_list_sinks_async_pager(): ) async_pager = await client.list_sinks(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -7431,6 +7446,9 @@ def test_list_links_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, logging_config.Link) @@ -7517,6 +7535,8 @@ async def test_list_links_async_pager(): ) async_pager = await client.list_links(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -8253,6 +8273,9 @@ def test_list_exclusions_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, logging_config.LogExclusion) @@ -8339,6 +8362,8 @@ async def test_list_exclusions_async_pager(): ) async_pager = await client.list_exclusions(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) diff --git a/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_logging_service_v2.py b/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_logging_service_v2.py index 544b2fd557db..65559a5d1073 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_logging_service_v2.py +++ b/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_logging_service_v2.py @@ -1856,6 +1856,9 @@ def test_list_log_entries_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, log_entry.LogEntry) @@ -1942,6 +1945,8 @@ async def test_list_log_entries_async_pager(): ) async_pager = await client.list_log_entries(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -2210,6 +2215,9 @@ def test_list_monitored_resource_descriptors_pager(transport_name: str = "grpc") assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, monitored_resource_pb2.MonitoredResourceDescriptor) @@ -2296,6 +2304,8 @@ async def test_list_monitored_resource_descriptors_async_pager(): ) async_pager = await client.list_monitored_resource_descriptors(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -2719,6 +2729,9 @@ def test_list_logs_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, str) @@ -2805,6 +2818,8 @@ async def test_list_logs_async_pager(): ) async_pager = await client.list_logs(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) diff --git a/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_metrics_service_v2.py b/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_metrics_service_v2.py index 9f598dbcf95e..90cdab2be2b2 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_metrics_service_v2.py +++ b/packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_metrics_service_v2.py @@ -1323,6 +1323,9 @@ def test_list_log_metrics_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, logging_metrics.LogMetric) @@ -1409,6 +1412,8 @@ async def test_list_log_metrics_async_pager(): ) async_pager = await client.list_log_metrics(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_config_service_v2.py b/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_config_service_v2.py index 9152aa72c6a1..9eec837e6f58 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_config_service_v2.py +++ b/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_config_service_v2.py @@ -1323,6 +1323,9 @@ def test_list_buckets_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, logging_config.LogBucket) @@ -1409,6 +1412,8 @@ async def test_list_buckets_async_pager(): ) async_pager = await client.list_buckets(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -3493,6 +3498,9 @@ def test__list_views_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, logging_config.LogView) @@ -3579,6 +3587,8 @@ async def test__list_views_async_pager(): ) async_pager = await client._list_views(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -4926,6 +4936,9 @@ def test__list_sinks_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, logging_config.LogSink) @@ -5012,6 +5025,8 @@ async def test__list_sinks_async_pager(): ) async_pager = await client._list_sinks(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -7431,6 +7446,9 @@ def test__list_links_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, logging_config.Link) @@ -7517,6 +7535,8 @@ async def test__list_links_async_pager(): ) async_pager = await client._list_links(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -8253,6 +8273,9 @@ def test__list_exclusions_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, logging_config.LogExclusion) @@ -8339,6 +8362,8 @@ async def test__list_exclusions_async_pager(): ) async_pager = await client._list_exclusions(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_logging_service_v2.py b/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_logging_service_v2.py index 544b2fd557db..65559a5d1073 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_logging_service_v2.py +++ b/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_logging_service_v2.py @@ -1856,6 +1856,9 @@ def test_list_log_entries_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, log_entry.LogEntry) @@ -1942,6 +1945,8 @@ async def test_list_log_entries_async_pager(): ) async_pager = await client.list_log_entries(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -2210,6 +2215,9 @@ def test_list_monitored_resource_descriptors_pager(transport_name: str = "grpc") assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, monitored_resource_pb2.MonitoredResourceDescriptor) @@ -2296,6 +2304,8 @@ async def test_list_monitored_resource_descriptors_async_pager(): ) async_pager = await client.list_monitored_resource_descriptors(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -2719,6 +2729,9 @@ def test_list_logs_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, str) @@ -2805,6 +2818,8 @@ async def test_list_logs_async_pager(): ) async_pager = await client.list_logs(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_metrics_service_v2.py b/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_metrics_service_v2.py index 0fc62ce795c0..310677b64bc6 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_metrics_service_v2.py +++ b/packages/gapic-generator/tests/integration/goldens/logging_internal/tests/unit/gapic/logging_v2/test_metrics_service_v2.py @@ -1323,6 +1323,9 @@ def test__list_log_metrics_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, logging_metrics.LogMetric) @@ -1409,6 +1412,8 @@ async def test__list_log_metrics_async_pager(): ) async_pager = await client._list_log_metrics(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) diff --git a/packages/gapic-generator/tests/integration/goldens/redis/tests/unit/gapic/redis_v1/test_cloud_redis.py b/packages/gapic-generator/tests/integration/goldens/redis/tests/unit/gapic/redis_v1/test_cloud_redis.py index 7d14d15849c9..8ca1fb5194a6 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis/tests/unit/gapic/redis_v1/test_cloud_redis.py +++ b/packages/gapic-generator/tests/integration/goldens/redis/tests/unit/gapic/redis_v1/test_cloud_redis.py @@ -1356,6 +1356,9 @@ def test_list_instances_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, cloud_redis.Instance) @@ -1442,6 +1445,8 @@ async def test_list_instances_async_pager(): ) async_pager = await client.list_instances(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -5063,6 +5068,9 @@ def test_list_instances_rest_pager(transport: str = 'rest'): pager = client.list_instances(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, cloud_redis.Instance) diff --git a/packages/gapic-generator/tests/integration/goldens/redis_selective/tests/unit/gapic/redis_v1/test_cloud_redis.py b/packages/gapic-generator/tests/integration/goldens/redis_selective/tests/unit/gapic/redis_v1/test_cloud_redis.py index 1076ace45ba6..3f6b7aa521f3 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis_selective/tests/unit/gapic/redis_v1/test_cloud_redis.py +++ b/packages/gapic-generator/tests/integration/goldens/redis_selective/tests/unit/gapic/redis_v1/test_cloud_redis.py @@ -1356,6 +1356,9 @@ def test_list_instances_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, cloud_redis.Instance) @@ -1442,6 +1445,8 @@ async def test_list_instances_async_pager(): ) async_pager = await client.list_instances(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -3111,6 +3116,9 @@ def test_list_instances_rest_pager(transport: str = 'rest'): pager = client.list_instances(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, cloud_redis.Instance) diff --git a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py index 66367a27be49..5c53e97f8d12 100755 --- a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py +++ b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/tests/unit/gapic/storagebatchoperations_v1/test_storage_batch_operations.py @@ -1428,6 +1428,9 @@ def test_list_jobs_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, storage_batch_operations_types.Job) @@ -1514,6 +1517,8 @@ async def test_list_jobs_async_pager(): ) async_pager = await client.list_jobs(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -3246,6 +3251,9 @@ def test_list_bucket_operations_pager(transport_name: str = "grpc"): assert pager._retry == retry assert pager._timeout == timeout + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, storage_batch_operations_types.BucketOperation) @@ -3332,6 +3340,8 @@ async def test_list_bucket_operations_async_pager(): ) async_pager = await client.list_bucket_operations(request={},) assert async_pager.next_page_token == 'abc' + assert str(async_pager).startswith(f'{async_pager.__class__.__name__}<') + responses = [] async for response in async_pager: # pragma: no branch responses.append(response) @@ -3924,6 +3934,9 @@ def test_list_jobs_rest_pager(transport: str = 'rest'): pager = client.list_jobs(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, storage_batch_operations_types.Job) @@ -4866,6 +4879,9 @@ def test_list_bucket_operations_rest_pager(transport: str = 'rest'): pager = client.list_bucket_operations(request=sample_request) + assert pager.next_page_token == 'abc' + assert str(pager).startswith(f'{pager.__class__.__name__}<') + results = list(pager) assert len(results) == 6 assert all(isinstance(i, storage_batch_operations_types.BucketOperation) diff --git a/packages/google-cloud-firestore/tests/unit/v1/test_pipeline_expressions.py b/packages/google-cloud-firestore/tests/unit/v1/test_pipeline_expressions.py index f76016805729..0c0f29df54b3 100644 --- a/packages/google-cloud-firestore/tests/unit/v1/test_pipeline_expressions.py +++ b/packages/google-cloud-firestore/tests/unit/v1/test_pipeline_expressions.py @@ -284,7 +284,8 @@ def test__from_query_filter_pb_composite_filter_or(self, mock_client): """ test composite OR filters - should create an or statement, made up of ands checking of existance of relevant fields + should create an or statement, made up of ands checking of existance + of relevant fields """ filter1_pb = query_pb.StructuredQuery.FieldFilter( field=query_pb.StructuredQuery.FieldReference(field_path="field1"),