Delete all partitions, including ones not following current naming scheme.

Fixes upgrade path from older erp5testnode version.

erp5/util/testnode/SlapOSControler.py

@@ -74,16 +74,19 @@ class SlapOSControler(object):
       os.mkdir(software_root)
       os.chmod(software_root, 0750)
     instance_root = config['instance_root']
+    if os.path.exists(instance_root):
+      # delete old paritions which may exists in order to not get its data
+      # (ex. MySQL db content) from previous testnode's runs
+      # In order to be able to change partition naming scheme, do this at
+      # instance_root level (such change happened already, causing problems).
+      shutil.rmtree(instance_root)
+    os.mkdir(instance_root)
     for i in range(0, MAX_PARTIONS):
       # create partition and configure computer
       # XXX: at the moment all partitions do share same virtual interface address
       # this is not a problem as usually all services are on different ports
       partition_reference = '%s-%s' %(config['partition_reference'], i)
       partition_path = os.path.join(instance_root, partition_reference)
-      if os.path.exists(partition_path):
-        # delete old paritions which may exists in order to not get its data (ex. MySQL db content)
-        # from previous testnode's runs
-        shutil.rmtree(partition_path)
       os.mkdir(partition_path)
       os.chmod(partition_path, 0750)
       computer.updateConfiguration(xml_marshaller.xml_marshaller.dumps({

erp5/util/testnode/__init__.py

@@ -90,9 +90,8 @@ def main(*args):
   CONFIG['proxy_database'] = os.path.join(slapos_directory, 'proxy.db')
   CONFIG['slapos_config'] = slapos_config = os.path.join(slapos_directory,
     'slapos.cfg')
-  for d in software_root, instance_root:
-    if not os.path.lexists(d):
-      os.mkdir(d)
+  if not os.path.lexists(software_root):
+    os.mkdir(software_root)
   CONFIG['master_url'] = 'http://%s:%s' % (CONFIG['proxy_host'],
         CONFIG['proxy_port'])
   open(slapos_config, 'w').write(pkg_resources.resource_string(