X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=tests%2FtestXrn.py;h=58aa763fedc95ec72751e517fc0aa9afef038ae6;hp=9725652d7b481b1e803cf848fe1fb3d2879397de;hb=db03eb2324ae3cc66232f7bedccf3f3f204349c7;hpb=bffe7b3b8e8a8c0b50d2c7d7a3b34323f275a79e diff --git a/tests/testXrn.py b/tests/testXrn.py index 9725652d..58aa763f 100755 --- a/tests/testXrn.py +++ b/tests/testXrn.py @@ -13,10 +13,10 @@ class TestXrn(unittest.TestCase): def __hrn(self,h,t,exp_urn): if verbose: print 'testing (',h,t,') expecting',exp_urn if exp_urn: - xrn=Xrn(hrn=h,type=t) + xrn=Xrn(h,type=t) if verbose: print xrn.dump_string() urn=xrn.get_urn() - (h1,t1) = Xrn(urn=urn).get_hrn_type() + (h1,t1) = Xrn(urn).get_hrn_type() if h1!=h or t1!=t or urn!=exp_urn: print "hrn->urn->hrn : MISMATCH with in=(%s,%s) -- out=(%s,%s) -- urn=%s"%(h,t,h1,t1,urn) self.assertEqual(h1,h) @@ -25,9 +25,9 @@ class TestXrn(unittest.TestCase): else: # could not figure how to use assertFails on object construction.. # with self.assertRaises(SfaAPIError): - # Xrn(hrn=h,type=t).get_urn() + # Xrn(h,type=t).get_urn() try: - Xrn(hrn=h,type=t).get_urn() + Xrn(h,type=t).get_urn() failure="Unexpectedly created Xrn object" except SfaAPIError: failure=False @@ -93,15 +93,15 @@ class TestXrn(unittest.TestCase): def test_login_base_001 (self): - xrn=PlXrn(hrn='ple.inria.omftest',type='slice') - self.assertEqual(xrn.login_base(),'inria') + xrn=PlXrn(xrn='ple.inria.omftest',type='slice') + self.assertEqual(xrn.pl_login_base(),'inria') def test_slicename_001 (self): - xrn=PlXrn(hrn='ple.inria.omftest',type='slice') - self.assertEqual(xrn.slicename(),'inria_omftest') + xrn=PlXrn(xrn='ple.inria.omftest',type='slice') + self.assertEqual(xrn.pl_slicename(),'inria_omftest') def test_authname_001 (self): - xrn=PlXrn(hrn='ple.inria.omftest',type='slice') - self.assertEqual(xrn.authname(),'inria') + xrn=PlXrn(xrn='ple.inria.omftest',type='slice') + self.assertEqual(xrn.pl_authname(),'inria')