Merge branch 'postgres-support'HEADmaster

1 files changed, 11 insertions, 5 deletions

diff --git a/tests/integration/test_browse.py b/tests/integration/test_browse.py
index 875821d..46ec329 100644
--- a/tests/integration/test_browse.py
+++ b/tests/integration/test_browse.py
@@ -22,6 +22,7 @@ def added_tracks(tm, dbsession, owner, data_manager):
     tm.abort()
 
     tracks = []
+    track_ids = []
     with tm:
         track = models.Track(
             owner=owner,
@@ -37,6 +38,7 @@ def added_tracks(tm, dbsession, owner, data_manager):
         dbsession.flush()
         data_manager.initialize(track.id).compress_gpx(load_gpx_asset("MyTourbook_1.gpx.gz"))
         tracks.append(track)
+        track_ids.append(track.id)
 
         track = models.Track(
             owner=owner,
@@ -52,12 +54,13 @@ def added_tracks(tm, dbsession, owner, data_manager):
         dbsession.flush()
         data_manager.initialize(track.id).compress_gpx(load_gpx_asset("Teasi_1.gpx.gz"))
         tracks.append(track)
+        track_ids.append(track.id)
 
     tm.begin()
     tm.doom()
 
     try:
-        yield tracks
+        yield track_ids
     finally:
         tm.abort()
         with tm:
@@ -80,13 +83,16 @@ def test_browse(testapp, dbsession, route_path, logged_in, tm, data_manager):
 
 def test_archive(testapp, dbsession, route_path, logged_in, tm, data_manager):
     # pylint: disable=too-many-positional-arguments
-    with added_tracks(tm, dbsession, logged_in, data_manager):
+    with added_tracks(tm, dbsession, logged_in, data_manager) as tracks:
         archive = testapp.get(
-            route_path('track-archive', _query=[("track_id[]", "1"), ("track_id[]", "2")])
+            route_path(
+                'track-archive',
+                _query=[("track_id[]", tracks[0]), ("track_id[]", tracks[1])],
+            )
         )
         result = io.BytesIO(archive.body)
 
         with zipfile.ZipFile(result, 'r') as zipped:
             assert len(zipped.namelist()) == 2
-            assert "track_1.gpx" in zipped.namelist()
-            assert "track_2.gpx" in zipped.namelist()
+            assert f"track_{tracks[0]}.gpx" in zipped.namelist()
+            assert f"track_{tracks[1]}.gpx" in zipped.namelist()