From e0fa7737195c6bfc6d34ea466e3044f0caea6ae5 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Wed, 18 Dec 2024 13:44:41 -0800 Subject: [PATCH 1/6] remove legacy conformance tests --- .github/workflows/conformance.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml index 8445240c3..d3df5f7e1 100644 --- a/.github/workflows/conformance.yaml +++ b/.github/workflows/conformance.yaml @@ -26,15 +26,11 @@ jobs: matrix: test-version: [ "v0.0.2" ] 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: From 4e3d92faa2bf0a706b753a17d0f7770688324a4b Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Wed, 18 Dec 2024 13:50:26 -0800 Subject: [PATCH 2/6] run against HEAD --- .github/workflows/conformance.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml index d3df5f7e1..347faf1dc 100644 --- a/.github/workflows/conformance.yaml +++ b/.github/workflows/conformance.yaml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - test-version: [ "v0.0.2" ] + test-version: [ "HEAD" ] py-version: [ 3.8 ] client-type: [ "async", "sync" ] include: From e875b80959fd560648701780362d3ca2a5f9c6d6 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Wed, 18 Dec 2024 13:52:51 -0800 Subject: [PATCH 3/6] head to main --- .github/workflows/conformance.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml index 347faf1dc..321b564a5 100644 --- a/.github/workflows/conformance.yaml +++ b/.github/workflows/conformance.yaml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - test-version: [ "HEAD" ] + test-version: [ "main" ] py-version: [ 3.8 ] client-type: [ "async", "sync" ] include: From e8d31c8c8dd5e901214050d593874f028fb3813f Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Wed, 18 Dec 2024 13:58:00 -0800 Subject: [PATCH 4/6] always attach error code to mutate rows --- test_proxy/handlers/grpc_handler.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test_proxy/handlers/grpc_handler.py b/test_proxy/handlers/grpc_handler.py index 2c70778dd..a298f42bc 100644 --- a/test_proxy/handlers/grpc_handler.py +++ b/test_proxy/handlers/grpc_handler.py @@ -107,9 +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"]) + 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 response = test_proxy_pb2.MutateRowsResult(status=status, entry=entries) return response From f76ff62482d25d7dca21de4f776800dfdf5613d2 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Wed, 18 Dec 2024 14:45:00 -0800 Subject: [PATCH 5/6] removed todos --- test_proxy/handlers/grpc_handler.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/test_proxy/handlers/grpc_handler.py b/test_proxy/handlers/grpc_handler.py index a298f42bc..fc2fa0d70 100644 --- a/test_proxy/handlers/grpc_handler.py +++ b/test_proxy/handlers/grpc_handler.py @@ -108,7 +108,6 @@ def BulkMutateRows(self, request, context, client_response=None): 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", [])] 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 response = test_proxy_pb2.MutateRowsResult(status=status, entry=entries) return response @@ -142,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) From 3aacfc9d4aa14cf26f8da011face219dbaad86db Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Fri, 3 Jan 2025 15:04:29 -0800 Subject: [PATCH 6/6] use v0.0.3 tag --- .github/workflows/conformance.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml index 321b564a5..9ef966bda 100644 --- a/.github/workflows/conformance.yaml +++ b/.github/workflows/conformance.yaml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - test-version: [ "main" ] + test-version: [ "v0.0.3" ] py-version: [ 3.8 ] client-type: [ "async", "sync" ] include: