X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fccn%2Fccnpeek.py;h=22acdbb791481bb4f36802449cb3e17981303f72;hb=039fbd9629d7570d4c175a5448d24badcd0f3aba;hp=ec6f4f849b66a45c6c6b4eaf3aa75651acc9726f;hpb=ea9bd019c72d8ffc67143b9905186b1313fac85c;p=nepi.git

diff --git a/test/resources/linux/ccn/ccnpeek.py b/test/resources/linux/ccn/ccnpeek.py
old mode 100644
new mode 100755
index ec6f4f84..22acdbb7
--- a/test/resources/linux/ccn/ccnpeek.py
+++ b/test/resources/linux/ccn/ccnpeek.py
@@ -4,9 +4,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,6 +17,8 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
+from __future__ import print_function
+
 from nepi.execution.resource import ResourceState, ResourceAction 
 from nepi.execution.ec import ExperimentController 
 from test_utils import skipIfAnyNotAlive
@@ -40,21 +41,21 @@ class LinuxCCNPeekTestCase(unittest.TestCase):
     def test_ccnpeek(self):
         ec = ExperimentController(exp_id = "test-linux-ccnpeek")
         
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         ec.set(node, "hostname", self.fedora_host)
         ec.set(node, "username", self.fedora_user)
         ec.set(node, "identity", self.fedora_identity)
         #ec.set(node, "cleanProcesses", True)
-        #ec.set(node, "cleanHome", True)
+        #ec.set(node, "cleanExperiment", True)
 
-        ccnd = ec.register_resource("LinuxCCND")
+        ccnd = ec.register_resource("linux::CCND")
         ec.register_connection(ccnd, node)
 
-        peek = ec.register_resource("LinuxCCNPeek")
+        peek = ec.register_resource("linux::CCNPeek")
         ec.set(peek, "contentName", "ccnx:/chunk0")
         ec.register_connection(peek, ccnd)
 
-        poke = ec.register_resource("LinuxCCNPoke")
+        poke = ec.register_resource("linux::CCNPoke")
         ec.set(poke, "contentName", "ccnx:/chunk0")
         ec.set(poke, "content", "DATA")
         ec.register_connection(poke, ccnd)
@@ -67,7 +68,7 @@ class LinuxCCNPeekTestCase(unittest.TestCase):
         ec.wait_finished(peek)
 
         stdout = ec.trace(peek, "stdout")
-        print stdout
+        print(stdout)
         expected = "DATA"
         self.assertTrue(stdout.find(expected) > -1)