fix testsclimbs

2 files changed, 11 insertions, 4 deletions

diff --git a/fietsboek/views/upload.py b/fietsboek/views/upload.py
index dde1c6c..d611723 100644
--- a/fietsboek/views/upload.py
+++ b/fietsboek/views/upload.py
@@ -180,8 +180,9 @@ def do_finish_upload(request):
         request.redis.sadd("hittekaart:queue:high", request.identity.id)
 
     track_id = track.id
-    request.tm.commit()
-    request.tm.begin()
+    if not request.tm.isDoomed():
+        request.tm.commit()
+        request.tm.begin()
 
     actions.extract_climbs_background(request, track_id)
 
diff --git a/tests/integration/test_upload.py b/tests/integration/test_upload.py
index f09b468..4191899 100644
--- a/tests/integration/test_upload.py
+++ b/tests/integration/test_upload.py
@@ -4,13 +4,19 @@ from sqlalchemy import select, func
 from webtest import Upload
 
 from testutils import load_gpx_asset
-from fietsboek import models
+from fietsboek import actions, models
 
 def test_upload_forbidden(testapp, route_path):
     testapp.get(route_path('upload'), status="4*")
 
 
-def test_upload(testapp, dbsession, route_path, logged_in):
+def test_upload(testapp, dbsession, route_path, logged_in, tm, monkeypatch):
+    monkeypatch.setattr(
+        actions,
+        "extract_climbs_background",
+        lambda _request, _track_id: None,
+    )
+
     # Step 1: Go to the upload form
     upload_site = testapp.get(route_path('upload'))