# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1637948773 -3600
# Node ID 2ca9e31d582ff5eb6eec4f83253b7b1880b299f1
# Parent  3074857949744fbea7f96d04c8972b99da6a2146
numpy and getscu are now included in jodogne/orthanc-tests Docker image

diff -r 307485794974 -r 2ca9e31d582f Start.sh
--- a/Start.sh	Thu Nov 25 18:59:40 2021 +0100
+++ b/Start.sh	Fri Nov 26 18:46:13 2021 +0100
@@ -16,16 +16,7 @@
 
 set -ex
 
-if [ ! -f "./getscu-3.6.5" ]; then
-    # This binary was generated by running Linux Standard Base on
-    # "Resources/DcmtkTools" in the Orthanc source distribution,
-    # as DCMTK 3.6.0 does not contain "getscu"
-    wget http://orthanc.osimis.io/ThirdPartyDownloads/linux-standard-base/getscu-3.6.5
-    chmod +x ./getscu-3.6.5
-fi
-
 sudo docker run --rm -t -i -p 5000:5000 -p 5001:5001 \
      -v `pwd`:/tmp/tests:ro \
-     -v `pwd`/getscu-3.6.5:/usr/bin/getscu:ro \
      --entrypoint python jodogne/orthanc-tests \
      /tmp/tests/Tests/Run.py --docker $*
diff -r 307485794974 -r 2ca9e31d582f Tests/Tests.py
--- a/Tests/Tests.py	Thu Nov 25 18:59:40 2021 +0100
+++ b/Tests/Tests.py	Fri Nov 26 18:46:13 2021 +0100
@@ -25,10 +25,11 @@
 import base64
 import bz2
 import copy
+import numpy
 import pprint
+import shutil
 import tempfile
 import unittest
-import shutil
 
 from PIL import ImageChops
 from Toolbox import *