From b3a0b95fb6d2ff668f634186f5b2c01c665ea64e Mon Sep 17 00:00:00 2001 From: Claudio-Daniel Freire Date: Mon, 2 May 2011 12:16:41 +0200 Subject: [PATCH] Just tidying up --- test/testbeds/planetlab/execute.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/testbeds/planetlab/execute.py b/test/testbeds/planetlab/execute.py index f864a675..fb73b3b3 100755 --- a/test/testbeds/planetlab/execute.py +++ b/test/testbeds/planetlab/execute.py @@ -23,14 +23,14 @@ class PlanetLabExecuteTestCase(unittest.TestCase): testbed_version = "01" instance = planetlab.TestbedController(testbed_version) slicename = "inria_nepi12" + pl_ssh_key = os.environ.get( + "PL_SSH_KEY", + "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'],) ) pl_user, pl_pwd = test_util.pl_auth() instance.defer_configure("homeDirectory", self.root_dir) instance.defer_configure("slice", slicename) - instance.defer_configure("sliceSSHKey", - os.environ.get( - "PL_SSH_KEY", - "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'],) ) ) + instance.defer_configure("sliceSSHKey", pl_ssh_key) instance.defer_configure("authUser", pl_user) instance.defer_configure("authPass", pl_pwd) -- 2.47.0