Commitbaea120

authored

Merge branch 'main' into release-please--branches--main

2 parentse4bf1e9 +66d84a3 commitbaea120Copy full SHA for baea120

File tree

+26

-1

lines changed

+26

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,8 @@ def _thread_main(self, ready):`
`664`	`664`	`_LOGGER.debug("waiting for recv.")`
`665`	`665`	`response=self._bidi_rpc.recv()`
`666`	`666`	`_LOGGER.debug("recved response.")`
`667`		`-self._on_response(response)`
	`667`	`+ifself._on_responseisnotNone:`
	`668`	`+self._on_response(response)`
`668`	`669`
`669`	`670`	`exceptexceptions.GoogleAPICallErrorasexc:`
`670`	`671`	`_LOGGER.debug(`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`importlogging`
`17`	`17`	`importqueue`
`18`	`18`	`importthreading`
	`19`	`+importtime`
`19`	`20`
`20`	`21`	`try:`
`21`	`22`	`fromunittestimportmock`
`@@ -894,3 +895,26 @@ def close_side_effect():`
`894`	`895`
`895`	`896`	`# calling stop twice should not result in an error.`
`896`	`897`	`consumer.stop()`
	`898`	`+`
	`899`	`+deftest_stop_error_logs(self,caplog):`
	`900`	`+"""`
	`901`	`+ Closing the client should result in no internal error logs`
	`902`	`+`
	`903`	`+ https://github.com/googleapis/python-api-core/issues/788`
	`904`	`+ """`
	`905`	`+caplog.set_level(logging.DEBUG)`
	`906`	`+bidi_rpc=mock.create_autospec(bidi.BidiRpc,instance=True)`
	`907`	`+bidi_rpc.is_active=True`
	`908`	`+on_response=mock.Mock(spec=["__call__"])`
	`909`	`+`
	`910`	`+consumer=bidi.BackgroundConsumer(bidi_rpc,on_response)`
	`911`	`+`
	`912`	`+consumer.start()`
	`913`	`+consumer.stop()`
	`914`	`+# let the background thread run for a while before exiting`
	`915`	`+time.sleep(0.1)`
	`916`	`+bidi_rpc.is_active=False`
	`917`	`+# running thread should not result in error logs`
	`918`	`+error_logs= [r.messageforrincaplog.recordsifr.levelname=="ERROR"]`
	`919`	`+assertnoterror_logs,f"Found unexpected ERROR logs:{error_logs}"`
	`920`	`+bidi_rpc.is_active=False`

Comments

(0)