update tests for 3.10 and address comments @wonder-sk

Author: MarcelGeo

.github/workflows/autotests.yml

@@ -13,13 +13,13 @@ concurrency:
 
 jobs:
   tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
 
       - uses: actions/setup-python@v2
         with:
-          python-version: "3.7.17"
+          python-version: "3.10"
 
       - name: Install python package dependencies
         run: |

mergin/client_pull.py

@@ -263,6 +263,7 @@ def download_project_cancel(job):
     job.is_cancelled = True
     job.executor.shutdown(wait=True)
     job.mp.log.info("--- download cancelled")
+    cleanup_tmp_dir(job.mp, job.tmp_dir)
 
 
 class UpdateTask:
@@ -550,6 +551,7 @@ def pull_project_cancel(job):
     job.is_cancelled = True
     job.executor.shutdown(wait=True)
     job.mp.log.info("--- pull cancelled")
+    cleanup_tmp_dir(job.mp, job.tmp_dir)  # delete our temporary dir and all its content
 
 
 class FileToMerge:
@@ -637,6 +639,7 @@ def pull_project_finalize(job: PullJob):
     except Exception as e:
         job.mp.log.error("Failed to apply pull changes: " + str(e))
         job.mp.log.info("--- pull aborted")
+        cleanup_tmp_dir(job.mp, job.tmp_dir)  # delete our temporary dir and all its content
         raise ClientError("Failed to apply pull changes: " + str(e))
 
     job.mp.update_metadata(job.project_info)

mergin/client_push.py

@@ -261,6 +261,7 @@ def push_project_finalize(job):
             job.transferred_size, job.total_size
         )
         job.mp.log.error("--- push finish failed! " + error_msg)
+        cleanup_tmp_dir(job.mp, job.tmp_dir)  # delete our temporary dir and all its content
         raise ClientError("Upload error: " + error_msg)
 
     if with_upload_of_files:
@@ -287,6 +288,7 @@ def push_project_finalize(job):
                 job.mp.log.info("cancel response: " + resp_cancel.msg)
             except ClientError as err2:
                 job.mp.log.info("cancel response: " + str(err2))
+            cleanup_tmp_dir(job.mp, job.tmp_dir)  # delete our temporary dir and all its content
             raise err
 
     job.mp.update_metadata(job.server_resp)
@@ -295,10 +297,10 @@ def push_project_finalize(job):
     except Exception as e:
         job.mp.log.error("Failed to apply push changes: " + str(e))
         job.mp.log.info("--- push aborted")
+        cleanup_tmp_dir(job.mp, job.tmp_dir)  # delete our temporary dir and all its content
         raise ClientError("Failed to apply push changes: " + str(e))
 
     cleanup_tmp_dir(job.mp, job.tmp_dir)  # delete our temporary dir and all its content
-
     remove_diff_files(job)
 
     job.mp.log.info("--- push finished - new project version " + job.server_resp["version"])
@@ -321,6 +323,8 @@ def push_project_cancel(job):
     except ClientError as err:
         job.mp.log.error("--- push cancelling failed! " + str(err))
         raise err
+    finally:
+        cleanup_tmp_dir(job.mp, job.tmp_dir)  # delete our temporary dir and all its content
     job.mp.log.info("--- push cancel response: " + str(job.server_resp))
 
 

mergin/utils.py

@@ -307,7 +307,5 @@ def cleanup_tmp_dir(mp, tmp_dir: tempfile.TemporaryDirectory):
         tmp_dir.cleanup()
     except PermissionError:
         mp.log.warning(f"Permission error during tmp dir cleanup: {tmp_dir.name}")
-        pass  # Ignore the error and continue
     except Exception as e:
         mp.log.error(f"Error during tmp dir cleanup: {tmp_dir.name}: {e}")
-        pass  # Ignore the error and continue