Commit b24d43b8 authored by Łukasz Nowak's avatar Łukasz Nowak

Be informative about errors.

parent cc26793c
...@@ -7,6 +7,7 @@ import sys ...@@ -7,6 +7,7 @@ import sys
import glob import glob
import threading import threading
import ZODB import ZODB
import subprocess
from asyncore import socket_map from asyncore import socket_map
from ZODB.DemoStorage import DemoStorage from ZODB.DemoStorage import DemoStorage
from ZODB.FileStorage import FileStorage from ZODB.FileStorage import FileStorage
...@@ -47,8 +48,7 @@ if save_mysql: ...@@ -47,8 +48,7 @@ if save_mysql:
command = 'mysqldump %s > %s' % (getMySQLArguments(), dump_sql_path,) command = 'mysqldump %s > %s' % (getMySQLArguments(), dump_sql_path,)
if verbosity: if verbosity:
_print('Dumping MySQL database with %s...' % command) _print('Dumping MySQL database with %s...' % command)
ret = os.system(command) subprocess.check_call(command, shell=True)
assert not ret
_print("Cleaning static files ... ") _print("Cleaning static files ... ")
for static_dir in static_dir_list: for static_dir in static_dir_list:
...@@ -62,8 +62,7 @@ if load: ...@@ -62,8 +62,7 @@ if load:
if save_mysql: if save_mysql:
if os.path.exists(dump_sql_path): if os.path.exists(dump_sql_path):
_print("Restoring MySQL database ... ") _print("Restoring MySQL database ... ")
ret = os.system("mysql %s < %s" % (getMySQLArguments(), dump_sql_path)) subprocess.check_call("mysql %s < %s" % (getMySQLArguments(), dump_sql_path), shell=True)
assert not ret
else: else:
_print("Could not find MySQL dump (%r), will recreate catalog ... " % dump_sql_path) _print("Could not find MySQL dump (%r), will recreate catalog ... " % dump_sql_path)
os.environ['erp5_tests_recreate_catalog'] = '1' os.environ['erp5_tests_recreate_catalog'] = '1'
......
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