Skip to content

Commit

Permalink
fix(python): process.terminate() got an unexpected keyword argument '…
Browse files Browse the repository at this point in the history
…timeout' (#2421)

Corrected usage of `process.terminate` to remove unexpected `timeout`
argument. Not sure how this did not surface in integration tests (will
investigate later).

Fixes #2398
  • Loading branch information
RomainMuller authored Jan 13, 2021
1 parent 4aaed09 commit 2bac5fd
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [1.17.1](https://github.com/aws/jsii/compare/v1.17.0...v1.17.1) (2021-01-13)

### Bug Fixes

* **python:** process.terminate() got an unexpected keyword argument 'timeout' ([#2421](https://github.com/aws/jsii/issues/2421)), closes [#2398](https://github.com/aws/jsii/issues/2398)


## [1.17.0](https://github.com/aws/jsii/compare/v1.16.0...v1.17.0) (2021-01-13)


Expand Down
6 changes: 2 additions & 4 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
"lerna": "3.13.1",
"npmClient": "yarn",
"useWorkspaces": true,
"packages": [
"packages/*"
],
"packages": ["packages/*"],
"command": {
"bootstrap": {
"rejectCycles": true
}
},
"version": "1.17.0"
"version": "1.17.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,7 @@ def stop(self):
try:
self._process.wait(timeout=5)
except subprocess.TimeoutExpired:
try:
self._process.terminate(timeout=5)
except subprocess.TimeoutExpired:
self._process.kill()
self._process.terminate()

self._ctx_stack.close()

Expand Down

0 comments on commit 2bac5fd

Please sign in to comment.