Mercurial > hg > orthanc-tests

comparison Tests/Tests.py @ 354:88f076b906ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test ArchiveSizeMB in archive jobs
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 03 Dec 2020 18:15:59 +0100
parents 49f2943544eb
children 95ee4e79825b
comparison
equal deleted inserted replaced
353:49f2943544eb 354:88f076b906ca
4199 4199
4200 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) 4200 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
4201 self.assertEqual(1, len(z.namelist())) 4201 self.assertEqual(1, len(z.namelist()))
4202 self.assertFalse('DICOMDIR' in z.namelist()) 4202 self.assertFalse('DICOMDIR' in z.namelist())
4203 4203
4204 info = DoGet(_REMOTE, '/jobs/%s' % job)
4205 self.assertEqual(0, info['Content']['ArchiveSizeMB']) # New in Orthanc 1.8.1
4206 self.assertEqual(1, info['Content']['InstancesCount'])
4207 self.assertEqual(0, info['Content']['UncompressedSizeMB'])
4208
4204 job2 = MonitorJob2(_REMOTE, lambda: DoPost 4209 job2 = MonitorJob2(_REMOTE, lambda: DoPost
4205 (_REMOTE, '/studies/%s/media' % kneeT1, { 4210 (_REMOTE, '/studies/%s/media' % kneeT1, {
4206 'Synchronous' : False 4211 'Synchronous' : False
4207 })) 4212 }))
4208 4213
4211 self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job)) 4216 self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job))
4212 4217
4213 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job2) 4218 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job2)
4214 self.assertEqual(2, len(z.namelist())) 4219 self.assertEqual(2, len(z.namelist()))
4215 self.assertTrue('DICOMDIR' in z.namelist()) 4220 self.assertTrue('DICOMDIR' in z.namelist())
4221
4222 info = DoGet(_REMOTE, '/jobs/%s' % job2)
4223 self.assertEqual(0, info['Content']['ArchiveSizeMB']) # New in Orthanc 1.8.1
4224 self.assertEqual(1, info['Content']['InstancesCount'])
4225 self.assertEqual(0, info['Content']['UncompressedSizeMB'])
4216 4226
4217 job = MonitorJob2(_REMOTE, lambda: DoPost 4227 job = MonitorJob2(_REMOTE, lambda: DoPost
4218 (_REMOTE, '/tools/create-archive', { 4228 (_REMOTE, '/tools/create-archive', {
4219 'Synchronous' : False, 4229 'Synchronous' : False,
4220 'Resources' : [ kneeT1, kneeT2 ], 4230 'Resources' : [ kneeT1, kneeT2 ],
4222 4232
4223 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) 4233 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
4224 self.assertEqual(2, len(z.namelist())) 4234 self.assertEqual(2, len(z.namelist()))
4225 self.assertFalse('DICOMDIR' in z.namelist()) 4235 self.assertFalse('DICOMDIR' in z.namelist())
4226 4236
4237 info = DoGet(_REMOTE, '/jobs/%s' % job)
4238 self.assertEqual(0, info['Content']['ArchiveSizeMB']) # New in Orthanc 1.8.1
4239 self.assertEqual(2, info['Content']['InstancesCount'])
4240 self.assertEqual(0, info['Content']['UncompressedSizeMB'])
4241
4227 job = MonitorJob2(_REMOTE, lambda: DoPost 4242 job = MonitorJob2(_REMOTE, lambda: DoPost
4228 (_REMOTE, '/tools/create-media', { 4243 (_REMOTE, '/tools/create-media', {
4229 'Synchronous' : False, 4244 'Synchronous' : False,
4230 'Resources' : [ kneeT1, kneeT2 ], 4245 'Resources' : [ kneeT1, kneeT2 ],
4231 })) 4246 }))
4232 4247
4233 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job) 4248 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
4234 self.assertEqual(3, len(z.namelist())) 4249 self.assertEqual(3, len(z.namelist()))
4235 self.assertTrue('DICOMDIR' in z.namelist()) 4250 self.assertTrue('DICOMDIR' in z.namelist())
4236 4251
4252 self.assertEqual(0, info['Content']['ArchiveSizeMB']) # New in Orthanc 1.8.1
4253 self.assertEqual(2, info['Content']['InstancesCount'])
4254 self.assertEqual(0, info['Content']['UncompressedSizeMB'])
4255
4237 4256
4238 def test_queries_hierarchy(self): 4257 def test_queries_hierarchy(self):
4239 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') 4258 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
4240 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') 4259 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
4241 4260