From 3d992047a83d0668e484700f7077753752adee21 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Thu, 4 Apr 2019 14:45:30 -0700 Subject: monkeypatch annoying pytest shutdown exception --- python_client/codegen_python_client.sh | 20 ++++++++++++++++++++ python_client/fatcat_client/api_client.py | 7 +++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/python_client/codegen_python_client.sh b/python_client/codegen_python_client.sh index 5ab0ff92..5a30910d 100755 --- a/python_client/codegen_python_client.sh +++ b/python_client/codegen_python_client.sh @@ -25,6 +25,26 @@ mkdir -p fatcat_client cp -r $OUTPUT/fatcat_client/* fatcat_client cp $OUTPUT/README.md README.md +# fix an annoying/buggy __del__() in codegen +patch -p0 << END_PATCH +--- fatcat_client/api_client.py ++++ fatcat_client/api_client.py +@@ -76,8 +76,11 @@ class ApiClient(object): + self.user_agent = 'Swagger-Codegen/1.0.0/python' + + def __del__(self): +- self.pool.close() +- self.pool.join() ++ try: ++ self.pool.close() ++ self.pool.join() ++ except: ++ pass + + @property + def user_agent(self): +END_PATCH + # these tests are basically no-ops mkdir -p tests/codegen cp -r $OUTPUT/test/* tests/codegen diff --git a/python_client/fatcat_client/api_client.py b/python_client/fatcat_client/api_client.py index 8ebab103..af25fc2c 100644 --- a/python_client/fatcat_client/api_client.py +++ b/python_client/fatcat_client/api_client.py @@ -76,8 +76,11 @@ class ApiClient(object): self.user_agent = 'Swagger-Codegen/1.0.0/python' def __del__(self): - self.pool.close() - self.pool.join() + try: + self.pool.close() + self.pool.join() + except: + pass @property def user_agent(self): -- cgit v1.2.3