Commit ca3d4b0f authored by Jérome Perrin's avatar Jérome Perrin

use shutil module instead of os.system

split assert statement in two statements


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24091 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 27d3e596
import ZODB
import os import os
import shutil
import ZODB
from ZODB.DemoStorage import DemoStorage from ZODB.DemoStorage import DemoStorage
from ZODB.FileStorage import FileStorage from ZODB.FileStorage import FileStorage
from Products.ERP5Type.tests.utils import getMySQLArguments from Products.ERP5Type.tests.utils import getMySQLArguments
...@@ -14,19 +15,22 @@ if os.environ.get('erp5_load_data_fs'): ...@@ -14,19 +15,22 @@ if os.environ.get('erp5_load_data_fs'):
else: else:
Storage = DemoStorage(base=FileStorage(new_data_fs_path), quota=(1<<20)) Storage = DemoStorage(base=FileStorage(new_data_fs_path), quota=(1<<20))
print("Restoring MySQL database ... ") print("Restoring MySQL database ... ")
assert os.system("mysql %s < %s/dump.sql" % ( ret = os.system("mysql %s < %s/dump.sql" % (
getMySQLArguments(), instance_home)) == 0 getMySQLArguments(), instance_home))
assert ret == 0
print("Restoring static files ... ") print("Restoring static files ... ")
for dir in ('Constraint', 'Document', 'PropertySheet', 'Extensions'): for dir in ('Constraint', 'Document', 'PropertySheet', 'Extensions'):
if os.path.exists('%s/%s.bak' % (instance_home, dir)): if os.path.exists(os.path.join(instance_home, '%s.bak' % dir)):
assert os.system('rm -rf %s/%s' % (instance_home, dir)) == 0 full_path = os.path.join(instance_home, dir)
assert os.system('cp -ar %s/%s.bak %s/%s' % ( shutil.rmtree(full_path)
instance_home, dir, instance_home, dir)) == 0 shutil.copytree(os.path.join(instance_home, '%s.bak' % dir),
full_path, symlinks=True)
elif os.environ.get('erp5_save_data_fs'): elif os.environ.get('erp5_save_data_fs'):
print("Cleaning static files ... ") print("Cleaning static files ... ")
for dir in ('Constraint', 'Document', 'PropertySheet', 'Extensions'): for dir in ('Constraint', 'Document', 'PropertySheet', 'Extensions'):
if os.path.exists('%s/%s' % (instance_home, dir)): full_path = os.path.join(instance_home, dir)
assert os.system('rm -f %s/%s/*' % (instance_home, dir)) == 0 if os.path.exists(full_path):
shutil.rmtree(full_path)
if os.path.exists(new_data_fs_path): if os.path.exists(new_data_fs_path):
os.remove(new_data_fs_path) os.remove(new_data_fs_path)
Storage = FileStorage(new_data_fs_path) Storage = FileStorage(new_data_fs_path)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment