Mercurial > hg > orthanc-tests

changeset 862:c6015092833c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged pg-next-699 -> default
author Alain Mazy <am@orthanc.team>
date Fri, 28 Nov 2025 15:46:28 +0100
parents 18879a9a612c (current diff) a8d717206449 (diff)
children 6380edfc4345
files
diffstat 3 files changed, 13 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/NewTests/Concurrency/test_transfer.py	Wed Nov 26 16:42:21 2025 +0100
+++ b/NewTests/Concurrency/test_transfer.py	Fri Nov 28 15:46:28 2025 +0100
@@ -63,13 +63,16 @@
     def test_push(self):
         oa, ob = self.clean_start()
 
-        populator = OrthancTestDbPopulator(oa, studies_count=2, series_count=2, instances_count=200, random_seed=65)
+        if oa.is_plugin_version_at_least("transfers", 1, 6, 0):  # need the PeerCommitTimeout config set to 600
+            populator = OrthancTestDbPopulator(oa, studies_count=5, series_count=2, instances_count=300, random_seed=65)
+        else:
+            populator = OrthancTestDbPopulator(oa, studies_count=2, series_count=2, instances_count=200, random_seed=65)
         populator.execute()
 
         all_studies_ids = oa.studies.get_all_ids()
         instances_count = oa.get_statistics().instances_count
         disk_size = oa.get_statistics().total_disk_size
-        repeat_count = 2
+        repeat_count = 1
 
         for compression in [True, False]:
             start_time = time.time()
@@ -101,13 +104,16 @@
     def test_pull(self):
         oa, ob = self.clean_start()
 
-        populator = OrthancTestDbPopulator(ob, studies_count=2, series_count=2, instances_count=200, random_seed=65)
+        if oa.is_plugin_version_at_least("transfers", 1, 6, 0):  # need the PeerCommitTimeout config set to 600
+            populator = OrthancTestDbPopulator(oa, studies_count=5, series_count=2, instances_count=300, random_seed=65)
+        else:
+            populator = OrthancTestDbPopulator(oa, studies_count=2, series_count=2, instances_count=200, random_seed=65)
         populator.execute()
 
         all_studies_ids = ob.studies.get_all_ids()
         instances_count = ob.get_statistics().instances_count
         disk_size = ob.get_statistics().total_disk_size
-        repeat_count = 2
+        repeat_count = 1
 
         for compression in [True, False]:
             start_time = time.time()
--- a/NewTests/PostgresUpgrades/docker-compose.yml	Wed Nov 26 16:42:21 2025 +0100
+++ b/NewTests/PostgresUpgrades/docker-compose.yml	Fri Nov 28 15:46:28 2025 +0100
@@ -17,7 +17,7 @@
 
   # Orthanc previous version
   orthanc-pg-15-previous-revision:
-    image: orthancteam/orthanc:25.5.1
+    image: orthancteam/orthanc:25.9.0
     container_name: orthanc-pg-15-previous-revision
     depends_on: [pg-15]
     restart: unless-stopped
@@ -30,7 +30,7 @@
 
   # Orthanc previous version to run the integration tests
   orthanc-pg-15-previous-revision-for-integ-tests:
-    image: orthancteam/orthanc:25.5.1
+    image: orthancteam/orthanc:25.9.0
     container_name: orthanc-pg-15-previous-revision-for-integ-tests
     depends_on: [pg-15]
     restart: unless-stopped
--- a/NewTests/PostgresUpgrades/downgrade.sh	Wed Nov 26 16:42:21 2025 +0100
+++ b/NewTests/PostgresUpgrades/downgrade.sh	Fri Nov 28 15:46:28 2025 +0100
@@ -7,7 +7,7 @@
 pushd /scripts/orthanc-databases/
 # hg update -r default
 
-psql -U postgres -f /scripts/orthanc-databases/PostgreSQL/Plugins/SQL/Downgrades/Rev6ToRev5.sql
+psql -U postgres -f /scripts/orthanc-databases/PostgreSQL/Plugins/SQL/Downgrades/Rev699ToRev6.sql
 
 # if you want to test a downgrade procedure, you may use this code ...
 # psql -U postgres -f downgrade.sql