From 960793d0aacb44b5ba535993c28e096c231251a8 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 6 Mar 2008 09:55:27 +0000
Subject: [PATCH] first try to use the testFrame without option.path but being
 directly in the right directory with chdir option

---
 system/TestKey.py    | 4 ++--
 system/TestMain.py   | 2 --
 system/TestPlc.py    | 3 +--
 system/TestSliver.py | 4 +---
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/system/TestKey.py b/system/TestKey.py
index 28032f2..69520ad 100644
--- a/system/TestKey.py
+++ b/system/TestKey.py
@@ -11,9 +11,9 @@ class TestKey:
         return self.key_spec['name']
 
     def publicpath(self):
-        return "/root/%s/keys/%s.pub"%(self.test_plc.path,self.name())
+        return "keys/%s.pub"%(self.name())
     def privatepath(self):
-        return "/root/%s/keys/%s.rsa"%(self.test_plc.path,self.name())
+        return "keys/%s.rsa"%(self.name())
 
     def store_key(self):
         pub=self.publicpath()
diff --git a/system/TestMain.py b/system/TestMain.py
index 576e8bb..5e23cae 100755
--- a/system/TestMain.py
+++ b/system/TestMain.py
@@ -154,8 +154,6 @@ steps refer to a method in TestPlc or to a step_* module
             #self.options.steps=['dump','clean','install','populate']
             self.options.steps=TestMain.default_steps
 
-        # store self.path in options.path for the various callbacks
-        self.options.path = self.path
         # this is useful when propagating on host boxes, to avoid conflicts
         self.options.buildname = os.path.basename (os.path.abspath (self.path))
 
diff --git a/system/TestPlc.py b/system/TestPlc.py
index baa2091..fdb8cff 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -245,7 +245,6 @@ class TestPlc:
         # with the last two steps (i386/myplc...) removed
         repo_url = options.myplc_url
         repo_url = os.path.dirname(repo_url)
-        repo_url = os.path.dirname(repo_url)
         create_vserver="%s/vtest-init-vserver.sh %s %s -- --interface eth0:%s"%\
             (build_dir,self.vservername,repo_url,self.vserverip)
         if self.run_in_host(create_vserver) != 0:
@@ -289,7 +288,7 @@ class TestPlc:
 
     ### 
     def configure(self,options):
-        tmpname='/root/%s/%s.plc-config-tty'%(options.path,self.name())
+        tmpname='%s.plc-config-tty'%(self.name())
         fileconf=open(tmpname,'w')
         for var in [ 'PLC_NAME',
                      'PLC_ROOT_PASSWORD',
diff --git a/system/TestSliver.py b/system/TestSliver.py
index 5be0a25..865b0ba 100644
--- a/system/TestSliver.py
+++ b/system/TestSliver.py
@@ -49,9 +49,7 @@ class TestSliver:
     def do_check_tcp(self,tcp_param,options):
         for tcp_spec in tcp_param:
             #copy the tcptest file under the chroot
-            path=options.path
-            localfile="/root/"+path+"/tcptest.py"
-            remotefile="tcptest.py"
+            localfile=remotefile="tcptest.py"
             self.test_plc.copy_in_guest(localfile, remotefile, False)
             peer_param=tcp_spec['tcp_fields']
             if (tcp_spec['tcp_fields']['peer_name']=='server'):
-- 
2.47.0