Mercurial > hg > orthanc-tests
comparison Tests/Tests.py @ 83:3f2170efa8d2
patches for python3
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 23 Jun 2016 18:04:59 +0200 |
parents | 5920954287dd |
children | 0401ef51f5c1 |
comparison
equal
deleted
inserted
replaced
82:91e2ed032f96 | 83:3f2170efa8d2 |
---|---|
127 | 127 |
128 | 128 |
129 | 129 |
130 class Orthanc(unittest.TestCase): | 130 class Orthanc(unittest.TestCase): |
131 def setUp(self): | 131 def setUp(self): |
132 if (sys.version_info >= (3, 0)): | |
133 # Remove annoying warnings about unclosed socket in Python 3 | |
134 import warnings | |
135 warnings.simplefilter("ignore", ResourceWarning) | |
136 | |
132 DropOrthanc(_LOCAL) | 137 DropOrthanc(_LOCAL) |
133 DropOrthanc(_REMOTE) | 138 DropOrthanc(_REMOTE) |
134 UninstallLuaCallbacks() | 139 UninstallLuaCallbacks() |
135 #print "In test", self._testMethodName | 140 #print "In test", self._testMethodName |
136 | 141 |
529 'application/json') | 534 'application/json') |
530 j = DoPost(_REMOTE, '/instances', modified, 'application/dicom')['ID'] | 535 j = DoPost(_REMOTE, '/instances', modified, 'application/dicom')['ID'] |
531 | 536 |
532 self.assertNotEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) | 537 self.assertNotEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip()) |
533 #self.assertNotEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % i).strip()) | 538 #self.assertNotEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % i).strip()) |
534 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i).strip()) | 539 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i).strip()) |
535 DoGet(_REMOTE, '/instances/%s/content/6003-1010' % i) # Some private tag | 540 DoGet(_REMOTE, '/instances/%s/content/6003-1010' % i) # Some private tag |
536 | 541 |
537 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) | 542 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip()) |
538 #self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % j).strip()) | 543 #self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % j).strip()) |
539 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j)) | 544 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j)) |