diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml index 8445240c3..9ef966bda 100644 --- a/.github/workflows/conformance.yaml +++ b/.github/workflows/conformance.yaml @@ -24,17 +24,13 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - test-version: [ "v0.0.2" ] + test-version: [ "v0.0.3" ] py-version: [ 3.8 ] - client-type: [ "async", "sync", "legacy" ] + client-type: [ "async", "sync" ] include: - client-type: "sync" # sync client does not support concurrent streams test_args: "-skip _Generic_MultiStream" - - client-type: "legacy" - # legacy client is synchronous and does not support concurrent streams - # legacy client does not expose mutate_row. Disable those tests - test_args: "-skip _Generic_MultiStream -skip TestMutateRow_" fail-fast: false name: "${{ matrix.client-type }} client / python ${{ matrix.py-version }} / test tag ${{ matrix.test-version }}" steps: diff --git a/test_proxy/handlers/grpc_handler.py b/test_proxy/handlers/grpc_handler.py index 2c70778dd..fc2fa0d70 100644 --- a/test_proxy/handlers/grpc_handler.py +++ b/test_proxy/handlers/grpc_handler.py @@ -107,10 +107,7 @@ def BulkMutateRows(self, request, context, client_response=None): entries = [] if isinstance(client_response, dict) and "error" in client_response: entries = [bigtable_pb2.MutateRowsResponse.Entry(index=exc_dict.get("index",1), status=Status(code=exc_dict.get("code", 5))) for exc_dict in client_response.get("subexceptions", [])] - if not entries: - # only return failure on the overall request if there are failed entries - status = Status(code=client_response.get("code", 5), message=client_response["error"]) - # TODO: protos were updated. entry is now entries: https://github.com/googleapis/cndb-client-testing-protos/commit/e6205a2bba04acc10d12421a1402870b4a525fb3 + status = Status(code=client_response.get("code", 5), message=client_response["error"]) response = test_proxy_pb2.MutateRowsResult(status=status, entry=entries) return response @@ -144,5 +141,4 @@ def SampleRowKeys(self, request, context, client_response=None): else: for sample in client_response: sample_list.append(bigtable_pb2.SampleRowKeysResponse(offset_bytes=sample[1], row_key=sample[0])) - # TODO: protos were updated. sample is now samples: https://github.com/googleapis/cndb-client-testing-protos/commit/e6205a2bba04acc10d12421a1402870b4a525fb3 return test_proxy_pb2.SampleRowKeysResult(status=status, sample=sample_list)