# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1728061238 -7200
# Node ID afa9cdd13880dc9ed63822dcb06f32eaf08aef2b
# Parent  6bd2b7f409177587b9b8e4d478de0b85e4fad01a# Parent  0322fda1834e57e8dc97f824657e95f1a617b5e6
merge default -> find-refactoring

diff -r 6bd2b7f40917 -r afa9cdd13880 Tests/Tests.py
--- a/Tests/Tests.py	Fri Oct 04 19:00:25 2024 +0200
+++ b/Tests/Tests.py	Fri Oct 04 19:00:38 2024 +0200
@@ -8091,6 +8091,9 @@
         tagsDefault = GetTags(study, {})
 
         orthancVersion = DoGet(_REMOTE, '/system') ['Version']
+        if orthancVersion.startswith('mainline-'):  # happens in unstable orthancteam/orthanc images
+            orthancVersion = 'mainline'
+            
         self.assertEqual('Orthanc %s - PS 3.15-2008 Table E.1-1' % orthancVersion, tags2008['0012,0063'])
         self.assertEqual('Orthanc %s - PS 3.15-2017c Table E.1-1 Basic Profile' % orthancVersion, tags2017c['0012,0063'])
         self.assertEqual('Orthanc %s - PS 3.15-2021b Table E.1-1 Basic Profile' % orthancVersion, tags2021b['0012,0063'])
diff -r 6bd2b7f40917 -r afa9cdd13880 Tests/Toolbox.py
--- a/Tests/Toolbox.py	Fri Oct 04 19:00:25 2024 +0200
+++ b/Tests/Toolbox.py	Fri Oct 04 19:00:38 2024 +0200
@@ -397,7 +397,7 @@
 def IsPluginVersionAbove(orthanc, plugin, major, minor, revision):
     v = DoGet(orthanc, '/plugins/%s' % plugin)['Version']
 
-    if v == 'mainline':
+    if v.startswith('mainline'):
         return True
     else:
         tmp = v.split('.')