Commit060b339

authored

fix: handle bare 'grpc.Call' in 'from_grpc_error' (#298)

* fix: handle bare 'grpc.Call' in 'from_grpc_error'Fixes:#297.* tests: add assertion for 'exception.details'

1 parent214d88b commit060b339Copy full SHA for 060b339

File tree

+34

-1

lines changed

+34

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -487,9 +487,14 @@ def _is_informative_grpc_error(rpc_exc):`
`487`	`487`
`488`	`488`
`489`	`489`	`def_parse_grpc_error_details(rpc_exc):`
`490`		`-status=rpc_status.from_call(rpc_exc)`
	`490`	`+try:`
	`491`	`+status=rpc_status.from_call(rpc_exc)`
	`492`	`+exceptNotImplementedError:# workaround`
	`493`	`+return []`
	`494`	`+`
`491`	`495`	`ifnotstatus:`
`492`	`496`	`return []`
	`497`	`+`
`493`	`498`	`possible_errors= [`
`494`	`499`	`error_details_pb2.BadRequest,`
`495`	`500`	`error_details_pb2.PreconditionFailure,`

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,34 @@ def test_from_grpc_error_non_call():`
`237`	`237`	`assertexception.response==error`
`238`	`238`
`239`	`239`
	`240`	`+@pytest.mark.skipif(grpcisNone,reason="No grpc")`
	`241`	`+deftest_from_grpc_error_bare_call():`
	`242`	`+message="Testing"`
	`243`	`+`
	`244`	`+classTestingError(grpc.Call,grpc.RpcError):`
	`245`	`+def__init__(self,exception):`
	`246`	`+self.exception=exception`
	`247`	`+`
	`248`	`+defcode(self):`
	`249`	`+returnself.exception.grpc_status_code`
	`250`	`+`
	`251`	`+defdetails(self):`
	`252`	`+returnmessage`
	`253`	`+`
	`254`	`+nested_message="message"`
	`255`	`+error=TestingError(exceptions.GoogleAPICallError(nested_message))`
	`256`	`+`
	`257`	`+exception=exceptions.from_grpc_error(error)`
	`258`	`+`
	`259`	`+assertisinstance(exception,exceptions.GoogleAPICallError)`
	`260`	`+assertexception.codeisNone`
	`261`	`+assertexception.grpc_status_codeisNone`
	`262`	`+assertexception.message==message`
	`263`	`+assertexception.errors== [error]`
	`264`	`+assertexception.response==error`
	`265`	`+assertexception.details== []`
	`266`	`+`
	`267`	`+`
`240`	`268`	`defcreate_bad_request_details():`
`241`	`269`	`bad_request_details=error_details_pb2.BadRequest()`
`242`	`270`	`field_violation=bad_request_details.field_violations.add()`

Comments

(0)