X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fapplication.py;h=ab70b238966e1a2461503fd25ac9cf283ac8363a;hb=b9237caed1e08ba0ae47c872bebaea7fb393999e;hp=b6ccb6f125d01e0e5bd1ee4b28f87619fda100bc;hpb=d50ba1a08e541ded7a8b322493ebb1d0cc59c6ff;p=nepi.git

diff --git a/test/resources/linux/application.py b/test/resources/linux/application.py
index b6ccb6f1..ab70b238 100755
--- a/test/resources/linux/application.py
+++ b/test/resources/linux/application.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
@@ -32,13 +31,13 @@ import unittest
 
 class LinuxApplicationTestCase(unittest.TestCase):
     def setUp(self):
-        self.fedora_host = "nepi2.pl.sophia.inria.fr"
+        self.fedora_host = "fedora.pl.sophia.inria.fr"
         self.fedora_user = "inria_nepi"
 
-        self.ubuntu_host = "roseval.pl.sophia.inria.fr"
+        self.ubuntu_host = "ubuntu.pl.sophia.inria.fr"
         self.ubuntu_user = "inria_nepi"
         
-        self.target = "nepi5.pl.sophia.inria.fr"
+        self.target = "nepi.pl.sophia.inria.fr"
 
     @skipIfNotAlive
     def t_stdout(self, host, user):
@@ -94,15 +93,15 @@ class LinuxApplicationTestCase(unittest.TestCase):
 
         stdout = ec.trace(app, "stdout")
         size = ec.trace(app, "stdout", attr = TraceAttr.SIZE)
-        self.assertEquals(len(stdout), size)
+        self.assertEqual(len(stdout), size)
         
         block = ec.trace(app, "stdout", attr = TraceAttr.STREAM, block = 5, offset = 1)
-        self.assertEquals(block, stdout[5:10])
+        self.assertEqual(block, stdout[5:10])
 
         path = ec.trace(app, "stdout", attr = TraceAttr.PATH)
         rm = ec.get_resource(app)
         p = os.path.join(rm.run_home, "stdout")
-        self.assertEquals(path, p)
+        self.assertEqual(path, p)
 
         ec.shutdown()
 
@@ -141,7 +140,7 @@ main (void)
         ec.wait_finished(app)
 
         out = ec.trace(app, 'stdout')
-        self.assertEquals(out, "Hello, world!\n")
+        self.assertEqual(out, "Hello, world!\n")
 
         ec.shutdown()
 
@@ -157,7 +156,7 @@ main (void)
         ec.set(node, "cleanProcesses", True)
 
         apps = list()
-        for i in xrange(50):
+        for i in range(50):
             app = ec.register_resource("linux::Application")
             cmd = "ping -c5 %s" % self.target 
             ec.set(app, "command", cmd)
@@ -177,15 +176,15 @@ main (void)
         for app in apps:
             stdout = ec.trace(app, 'stdout')
             size = ec.trace(app, 'stdout', attr = TraceAttr.SIZE)
-            self.assertEquals(len(stdout), size)
+            self.assertEqual(len(stdout), size)
             
             block = ec.trace(app, 'stdout', attr = TraceAttr.STREAM, block = 5, offset = 1)
-            self.assertEquals(block, stdout[5:10])
+            self.assertEqual(block, stdout[5:10])
 
             path = ec.trace(app, 'stdout', attr = TraceAttr.PATH)
             rm = ec.get_resource(app)
             p = os.path.join(rm.run_home, 'stdout')
-            self.assertEquals(path, p)
+            self.assertEqual(path, p)
 
         ec.shutdown()
 
@@ -239,8 +238,8 @@ main (void)
         ec.set(node, "cleanExperiment", True)
         ec.set(node, "cleanProcesses", True)
 
-        sources = "http://yans.pl.sophia.inria.fr/code/nef/archive/tip.tar.gz;" \
-                "http://yans.pl.sophia.inria.fr/code/nef/raw-file/8ace577d4079/src/nef/images/menu/connect.png"
+        sources = "http://mirror.onelab.eu/third-party/nepi-tip.tgz;" \
+                "http://mirror.onelab.eu/third-party/nepi-connect.png"
 
         app = ec.register_resource("linux::Application")
         ec.set(app, "sources", sources)
@@ -262,12 +261,12 @@ main (void)
         self.assertTrue(exitcode.strip() == "0")
         
         out = ec.trace(app, "deploy_stdout")
-        self.assertTrue(out.find("tip.tar.gz") > -1)
-        self.assertTrue(out.find("connect.png") > -1)
+        self.assertTrue(out.find("nepi-tip.tgz") > -1)
+        self.assertTrue(out.find("nepi-connect.png") > -1)
 
         stdout = ec.trace(app, "stdout")
-        self.assertTrue(stdout.find("tip.tar.gz") > -1)
-        self.assertTrue(stdout.find("connect.png") > -1)
+        self.assertTrue(stdout.find("nepi-tip.tgz") > -1)
+        self.assertTrue(stdout.find("nepi-connect.png") > -1)
 
         ec.shutdown()