Mercurial > hg > orthanc-tests
changeset 713:afa9cdd13880 find-refactoring
merge default -> find-refactoring
| author | Alain Mazy <am@orthanc.team> |
|---|---|
| date | Fri, 04 Oct 2024 19:00:38 +0200 |
| parents | 6bd2b7f40917 (current diff) 0322fda1834e (diff) |
| children | 812ad50c5564 |
| files | Tests/Tests.py |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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'])
--- 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('.')