comparison Tests/Tests.py @ 214:13fa120c54a0

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 05 Feb 2019 14:55:03 +0100
parents eba6b8c38eee
children d8fc62207ba3
comparison
equal deleted inserted replaced
213:eba6b8c38eee 214:13fa120c54a0
1407 DoDelete(_REMOTE, '/peers/tata') 1407 DoDelete(_REMOTE, '/peers/tata')
1408 except: 1408 except:
1409 pass 1409 pass
1410 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto')) 1410 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto'))
1411 DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/' ]) 1411 DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/' ])
1412 DoPut(_REMOTE, '/peers/tata', [ 'http://localhost:8042/', 'user', 'pass' ]) 1412 DoPut(_REMOTE, '/peers/tata', { 'Url': 'http://localhost:8042/',
1413 'Username': 'user',
1414 'Password' : 'pass',
1415 'RemoteSelf' : 'self' })
1413 self.assertTrue('tata' in DoGet(_REMOTE, '/peers')) 1416 self.assertTrue('tata' in DoGet(_REMOTE, '/peers'))
1414 peersReadback = DoGet(_REMOTE, '/peers?expand') 1417 peersReadback = DoGet(_REMOTE, '/peers?expand')
1415 self.assertEqual('http://localhost:8042/', peersReadback['tata']['Url']) 1418 self.assertEqual('http://localhost:8042/', peersReadback['tata']['Url'])
1416 self.assertEqual('user', peersReadback['tata']['Username']) 1419 self.assertEqual('user', peersReadback['tata']['Username'])
1417 self.assertFalse('Password' in peersReadback['tata']) # make sure no sensitive data is included 1420
1421 if IsOrthancVersionAbove(_REMOTE, 1, 5, 4):
1422 self.assertEqual(None, peersReadback['tata']['Password']) # make sure no sensitive data is included
1423 self.assertFalse(peersReadback['tata']['Pkcs11']) # make sure no sensitive data is included
1424 self.assertEqual('self', peersReadback['tata']['RemoteSelf'])
1425 else:
1426 self.assertFalse('Password' in peersReadback['tata']) # make sure no sensitive data is included
1427 self.assertFalse('Pkcs11' in peersReadback['tata']) # make sure no sensitive data is included
1428 self.assertFalse('RemoteSelf' in peersReadback['tata'])
1429
1418 self.assertFalse('CertificateFile' in peersReadback['tata']) # make sure no sensitive data is included 1430 self.assertFalse('CertificateFile' in peersReadback['tata']) # make sure no sensitive data is included
1419 self.assertFalse('CertificateKeyFile' in peersReadback['tata']) # make sure no sensitive data is included 1431 self.assertFalse('CertificateKeyFile' in peersReadback['tata']) # make sure no sensitive data is included
1420 self.assertFalse('CertificateKeyPassword' in peersReadback['tata']) # make sure no sensitive data is included 1432 self.assertFalse('CertificateKeyPassword' in peersReadback['tata']) # make sure no sensitive data is included
1421 self.assertFalse('Pkcs11' in peersReadback['tata']) # make sure no sensitive data is included 1433
1422 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a' ])) 1434 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a' ]))
1423 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a', 'b', 'c' ])) 1435 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a', 'b', 'c' ]))
1424 self.assertTrue('store' in DoGet(_REMOTE, '/peers/toto')) 1436 self.assertTrue('store' in DoGet(_REMOTE, '/peers/toto'))
1425 self.assertTrue('store' in DoGet(_REMOTE, '/peers/tata')) 1437 self.assertTrue('store' in DoGet(_REMOTE, '/peers/tata'))
1426 DoDelete(_REMOTE, '/peers/toto') 1438 DoDelete(_REMOTE, '/peers/toto')