# HG changeset patch # User Sebastien Jodogne # Date 1611668975 -3600 # Node ID f673153f27a45744b4aa3d56e6a526f8b4f6abe0 # Parent e9b03d8f3b787baeea7e2883697d1323463c9fad use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes diff -r e9b03d8f3b78 -r f673153f27a4 Tests/Tests.py --- a/Tests/Tests.py Tue Jan 26 09:16:18 2021 +0100 +++ b/Tests/Tests.py Tue Jan 26 14:49:35 2021 +0100 @@ -2270,11 +2270,33 @@ stderr = FNULL) self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) - InstallLuaScriptFromPath(_REMOTE, 'Lua/TransferSyntaxDisable.lua') + + if IsOrthancVersionAbove(_REMOTE, 1, 9, 0): + a = DoPut(_REMOTE, '/tools/accepted-transfer-syntaxes', [ + '1.2.840.10008.1.2', '1.2.840.10008.1.2.1', '1.2.840.10008.1.2.2' + ]) + self.assertTrue('1.2.840.10008.1.2' in a) + self.assertTrue('1.2.840.10008.1.2.1' in a) + self.assertTrue('1.2.840.10008.1.2.2' in a) + self.assertEqual(3, len(a)) + self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/unknown-sop-class-accepted', 'nope')) + DoPut(_REMOTE, '/tools/unknown-sop-class-accepted', '0') + self.assertEqual(0, DoGet(_REMOTE, '/tools/unknown-sop-class-accepted')) + else: + InstallLuaScriptFromPath(_REMOTE, 'Lua/TransferSyntaxDisable.lua') + self.assertRaises(Exception, lambda: storescu('Knix/Loc/IM-0001-0001.dcm', False)) self.assertRaises(Exception, lambda: storescu('UnknownSopClassUid.dcm', True)) self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) - InstallLuaScriptFromPath(_REMOTE, 'Lua/TransferSyntaxEnable.lua') + + if IsOrthancVersionAbove(_REMOTE, 1, 9, 0): + a = DoPut(_REMOTE, '/tools/accepted-transfer-syntaxes', '*') + self.assertGreaterEqual(42, len(a)) + DoPut(_REMOTE, '/tools/unknown-sop-class-accepted', 'true') + self.assertEqual(1, DoGet(_REMOTE, '/tools/unknown-sop-class-accepted')) + else: + InstallLuaScriptFromPath(_REMOTE, 'Lua/TransferSyntaxEnable.lua') + DoPost(_REMOTE, '/tools/execute-script', "print('All special transfer syntaxes are now accepted')") storescu('Knix/Loc/IM-0001-0001.dcm', False) storescu('UnknownSopClassUid.dcm', True)