# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1544867445 -3600
# Node ID 6ff9d035b26bc254240612b4e62efeffdfce5de1
# Parent  bc8bc83465dcb32b2ae8982269a8c4535ecfabad
fix

diff -r bc8bc83465dc -r 6ff9d035b26b Tests/Tests.py
--- a/Tests/Tests.py	Fri Dec 14 11:42:18 2018 +0100
+++ b/Tests/Tests.py	Sat Dec 15 10:50:45 2018 +0100
@@ -487,8 +487,9 @@
     def test_archive(self):
         UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
         UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
-
-        z = GetArchive(_REMOTE, '/patients/%s/archive' % DoGet(_REMOTE, '/patients')[0])
+        knee = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17'
+
+        z = GetArchive(_REMOTE, '/patients/%s/archive' % knee)
         self.assertEqual(2, len(z.namelist()))
 
         z = GetArchive(_REMOTE, '/studies/%s/archive' % DoGet(_REMOTE, '/studies')[0])
@@ -498,10 +499,16 @@
         self.assertEqual(1, len(z.namelist()))
 
         UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
-
-        z = GetArchive(_REMOTE, '/patients/%s/archive' % DoGet(_REMOTE, '/patients')[0])
+        brainix = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0'
+
+        z = GetArchive(_REMOTE, '/patients/%s/archive' % knee)
         self.assertEqual(2, len(z.namelist()))
-        
+
+        z = PostArchive(_REMOTE, '/tools/create-archive', {
+            'Resources' : [ brainix, knee ]
+            })
+        self.assertEqual(3, len(z.namelist()))
+       
 
     def test_media_archive(self):
         UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
diff -r bc8bc83465dc -r 6ff9d035b26b Tests/Toolbox.py
--- a/Tests/Toolbox.py	Fri Dec 14 11:42:18 2018 +0100
+++ b/Tests/Toolbox.py	Sat Dec 15 10:50:45 2018 +0100
@@ -214,6 +214,15 @@
     else:
         return zipfile.ZipFile(StringIO(s), "r")
 
+def PostArchive(orthanc, uri, body):
+    # http://stackoverflow.com/a/1313868/881731
+    s = DoPost(orthanc, uri, body)
+
+    if (sys.version_info >= (3, 0)):
+        return zipfile.ZipFile(BytesIO(s), "r")
+    else:
+        return zipfile.ZipFile(StringIO(s), "r")
+
 def IsDefinedInLua(orthanc, name):
     s = DoPost(orthanc, '/tools/execute-script', 'print(type(%s))' % name, 'application/lua')
     return (s.strip() != 'nil')