changeset 692:377ad9690c7a

fix tests for mainline
author Alain Mazy <am@orthanc.team>
date Thu, 19 Sep 2024 09:57:32 +0200
parents 79c06b1ed0a8
children 4567c3947f8a
files NewTests/ExtraMainDicomTags/test_extra_main_dicom_tags.py NewTests/requirements.txt
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/NewTests/ExtraMainDicomTags/test_extra_main_dicom_tags.py	Wed Sep 18 14:54:47 2024 +0200
+++ b/NewTests/ExtraMainDicomTags/test_extra_main_dicom_tags.py	Thu Sep 19 09:57:32 2024 +0200
@@ -119,7 +119,7 @@
 
 
     def test_tools_find(self):
-        if self.o.is_orthanc_version_at_least(12, 5, 0):
+        if self.o.is_orthanc_version_at_least(12, 5, 0) and self.o.capabilities.has_extended_find:
 
             # upload a study
             self.o.upload_file(here / "../../Database/Brainix/Flair/IM-0001-0001.dcm")
@@ -195,7 +195,7 @@
             self.assertEqual(1, len(instances))
             self.assertIn("Rows", instances[0]["RequestedTags"])
             self.assertIn("PerformedProtocolCodeSequence", instances[0]["RequestedTags"])
-            self.assertIn("RequestAttributesSequence", instances[0]["RequestedTags"])  # note that, as of 1.12.5, Orthanc reads this from the disk !
+            self.assertIn("RequestAttributesSequence", instances[0]["RequestedTags"])
             self.assertEqual(c, self.get_storage_access_count()) # nothing should be read from disk
 
             # series level, request a sequence
@@ -259,7 +259,7 @@
         self.assertIn("00400260", metadata[0])      # PerformedProtocolCodeSequence
 
     def test_storage_accesses_for_dicom_web(self):
-        if self.o.is_orthanc_version_at_least(12, 5, 0):
+        if self.o.is_orthanc_version_at_least(12, 5, 0) and self.o.capabilities.has_extended_find:
 
             # upload a study
             self.o.upload_file(here / "../../Database/Brainix/Flair/IM-0001-0001.dcm")
--- a/NewTests/requirements.txt	Wed Sep 18 14:54:47 2024 +0200
+++ b/NewTests/requirements.txt	Thu Sep 19 09:57:32 2024 +0200
@@ -1,3 +1,3 @@
-orthanc-api-client>=0.16.0
+orthanc-api-client>=0.16.1
 orthanc-tools>=0.13.0
 uvicorn
\ No newline at end of file