X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=tests%2FtestInterfaces.py;fp=tests%2FtestInterfaces.py;h=61c0e2d35fe74d3a10667897ed19193108a170f2;hb=bf6667e58e514e3cace7e795772b5bde3aeed1aa;hp=ce2569682a8ff67bafa3572ffa8a72c4550613fa;hpb=a42270f0e0b81e8ff3f70e066d42a965c9c9739d;p=sfa.git diff --git a/tests/testInterfaces.py b/tests/testInterfaces.py index ce256968..61c0e2d3 100755 --- a/tests/testInterfaces.py +++ b/tests/testInterfaces.py @@ -12,7 +12,7 @@ from sfa.util.namespace import * from sfa.util.config import * from sfa.trust.certificate import * from sfa.trust.credential import * -from sfa.trust.sfaticket import * +from sfa.util.sfaticket import * from sfa.client import sfi def random_string(size): @@ -113,7 +113,7 @@ class RegistryTest(BasicTestCase): except: raise finally: - try: self.registry.remove(record['hrn']) + self.registry.remove(record['hrn']) def testRegisterPeerObject(self): @@ -189,7 +189,7 @@ class AggregateTest(BasicTestCase): # available resources agg_rspec = self.aggregate.get_resources(self.credential) # resources used by a slice - slice_rspec self.aggregate.get_resources(self.credential, self.slice['hrn']) + slice_rspec = self.aggregate.get_resources(self.credential, self.slice['hrn']) # will raise an exception if the rspec isnt valid RSpec(xml=agg_rspec) RSpec(xml=slice_rspec)