changeset 984:7c0587d83f6e

find_executable in /usr/bin too to avoid using the pynetdicom version
author Alain Mazy <am@orthanc.team>
date Fri, 25 Sep 2026 11:20:20 +0200
parents f3ae656ba5f2
children f9a5926ed466
files NewTests/helpers.py Tests/Toolbox.py
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/NewTests/helpers.py	Fri Sep 25 09:05:43 2026 +0200
+++ b/NewTests/helpers.py	Fri Sep 25 11:20:20 2026 +0200
@@ -89,6 +89,10 @@
 
     @classmethod
     def find_executable(cls, name):
+        p = os.path.join('/usr/bin', name)
+        if os.path.isfile(p):
+            return p
+
         p = os.path.join('/usr/local/bin', name)
         if os.path.isfile(p):
             return p
--- a/Tests/Toolbox.py	Fri Sep 25 09:05:43 2026 +0200
+++ b/Tests/Toolbox.py	Fri Sep 25 11:20:20 2026 +0200
@@ -337,6 +337,10 @@
         return m.groups()[0]
 
 def FindExecutable(name):
+    p = os.path.join('/usr/bin', name)
+    if os.path.isfile(p):
+        return p
+
     p = os.path.join('/usr/local/bin', name)
     if os.path.isfile(p):
         return p