X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=tests%2FtestXrn.py;h=6aae326853b690a71be3d0d4e8d53ce61da12e26;hp=f4a258433c481d40adfa23d9ad0bf6b39f8523ce;hb=HEAD;hpb=984251e274815ec985c3e62506bc7657a0d7a7ce

diff --git a/tests/testXrn.py b/tests/testXrn.py
index f4a25843..6aae3268 100755
--- a/tests/testXrn.py
+++ b/tests/testXrn.py
@@ -1,23 +1,24 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 import sys
 import unittest
 
 from sfa.util.faults import *
 from sfa.util.xrn import Xrn
-from sfa.util.plxrn import PlXrn
+
+from sfa.planetlab.plxrn import PlXrn
 
 verbose=False
 
 class TestXrn(unittest.TestCase):
 
     def __hrn(self,h,t,exp_urn):
-        if verbose: print 'testing (',h,t,') expecting',exp_urn
+        if verbose: print('testing (',h,t,') expecting',exp_urn)
         xrn=Xrn(h,type=t)
-        if verbose: print xrn.dump_string()
+        if verbose: print(xrn.dump_string())
         urn=xrn.get_urn()
         (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)
+            print("hrn->urn->hrn : MISMATCH with in=(%s,%s) -- out=(%s,%s) -- urn=%s"%(h,t,h1,t1,urn))
         self.assertEqual(h1,h)
         self.assertEqual(t1,t)
         self.assertEqual(urn,exp_urn)
@@ -70,10 +71,10 @@ class TestXrn(unittest.TestCase):
 
     def test_host001 (self):
         xrn=PlXrn (auth="ple.inria",hostname="onelab09.pl.sophia.inria.fr")
-        self.assertEqual (xrn.get_hrn_type(), ("ple.inria.onelab09",'node'))
+        self.assertEqual (xrn.get_hrn_type(), ("ple.inria.onelab09\\.pl\\.sophia\\.inria\\.fr",'node'))
     def test_host002 (self):
         xrn=PlXrn (auth="ple\\.inria",hostname="onelab09.pl.sophia.inria.fr")
-        self.assertEqual (xrn.get_hrn_type(), ("ple\\.inria.onelab09",'node'))
+        self.assertEqual (xrn.get_hrn_type(), ("ple\\.inria.onelab09\\.pl\\.sophia\\.inria\\.fr",'node'))
 
     def test_slice001  (self):
         xrn=PlXrn (auth="ple",slicename="inria_omftest")