Merge branch 'upstreammaster' into senslab2

[sfa.git] / tests / testXrn.py

diff --git a/tests/testXrn.py b/tests/testXrn.py
index f4a2584..7f97a7f 100755 (executable)
--- a/tests/testXrn.py
+++ b/tests/testXrn.py
@@ -1,10 +1,12 @@
 #!/usr/bin/python
+# just checking write access on repo
 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
 
@@ -70,10 +72,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")