X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fnode.py;h=02a2733137c2657e4712c2377ac236566a1ead69;hb=342187d6e7ce34d4fdf403952637659b93aa4bee;hp=69222112e890488d528aa70500a0d94caa9981e9;hpb=35af1f1f8393dc9663b2a8be8a4c2b1d78f03bc1;p=nepi.git diff --git a/test/resources/linux/node.py b/test/resources/linux/node.py index 69222112..02a27331 100755 --- a/test/resources/linux/node.py +++ b/test/resources/linux/node.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 LinuxNodeTestCase(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_execute(self, host, user): @@ -303,7 +302,7 @@ main (void) f1.close() f1.name - source = "%s;%s" % (dirpath, f1.name) + source = [dirpath, f1.name] destdir = "test" node.mkdir(destdir, clean = True) dest = "%s@%s:test" % (user, host)