From 7de14a54176ed0e7035f8904fd7800e37c6c1639 Mon Sep 17 00:00:00 2001
From: Lukasz Nowak <luke@nexedi.com>
Date: Wed, 6 Mar 2019 18:12:24 +0100
Subject: [PATCH] testnode: Shorten partition and software path

As testnode is used inside of slapos instance, its path is already long like:
   /srv/slapgrid/slappartXY

Very often partitions are kept in:

  /srv/slapgrid/slappartXY/srv/testnode/ZZZ/inst/test0-0

Shortening it to:

  /srv/slapgrid/slappartXY/srv/testnode/ZZZ/i/t-0

minimises chance to reach limit of maximum path, often hit by sockets.

Software path

  /srv/slapgrid/slappartXY/srv/testnode/ZZZ/soft/

has been shortened to

  /srv/slapgrid/slappartXY/srv/testnode/ZZZ/s/

for consistency.
---
 erp5/util/testnode/SlapOSControler.py | 4 ++--
 erp5/util/testnode/UnitTestRunner.py  | 2 +-
 erp5/util/testnode/__init__.py        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/erp5/util/testnode/SlapOSControler.py b/erp5/util/testnode/SlapOSControler.py
index e70d8751473..b7ecafb75a4 100644
--- a/erp5/util/testnode/SlapOSControler.py
+++ b/erp5/util/testnode/SlapOSControler.py
@@ -42,8 +42,8 @@ class SlapOSControler(object):
 
   def __init__(self, working_directory, config):
     self.config = config
-    self.software_root = os.path.join(working_directory, 'soft')
-    self.instance_root = os.path.join(working_directory, 'inst')
+    self.software_root = os.path.join(working_directory, 's')
+    self.instance_root = os.path.join(working_directory, 'i')
     self.slapos_config = os.path.join(working_directory, 'slapos.cfg')
     self.proxy_database = os.path.join(working_directory, 'proxy.db')
     self.instance_config = {}
diff --git a/erp5/util/testnode/UnitTestRunner.py b/erp5/util/testnode/UnitTestRunner.py
index f86cc3af878..a3ce39185b8 100644
--- a/erp5/util/testnode/UnitTestRunner.py
+++ b/erp5/util/testnode/UnitTestRunner.py
@@ -139,7 +139,7 @@ class UnitTestRunner(object):
       '--revision', node_test_suite.revision,
       '--test_suite', node_test_suite.test_suite,
       '--test_suite_title', node_test_suite.test_suite_title)
-    soft = config['slapos_directory'] + '/soft/'
+    soft = config['slapos_directory'] + '/s/'
     software_list = [soft + md5digest(x) for x in config['software_list']]
     PATH = os.getenv('PATH', '')
     PATH = ':'.join(x + '/bin' for x in software_list) + (PATH and ':' + PATH)
diff --git a/erp5/util/testnode/__init__.py b/erp5/util/testnode/__init__.py
index 480df94edff..e72efab25e2 100644
--- a/erp5/util/testnode/__init__.py
+++ b/erp5/util/testnode/__init__.py
@@ -62,7 +62,7 @@ def main(*args):
     logger.disable(logging.CRITICAL)
 
   CONFIG = {
-    'partition_reference': 'test0',
+    'partition_reference': 't0',
   }
   config = ConfigParser.SafeConfigParser()
   # do not change case of option keys
-- 
2.30.9