File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -47,13 +47,14 @@ def mysql_system_database(
47
47
):
48
48
"""Install database to given path."""
49
49
if run_services :
50
- mysql_install_db = find_executable ('mysql_install_db ' )
51
- assert mysql_install_db , 'You have to install mysql_install_db script.'
50
+ mysqld = find_executable ('mysqld ' )
51
+ assert mysqld , 'You have to install mysqld script.'
52
52
53
53
try :
54
- services_log .debug ('Starting mysql_install_db .' )
54
+ services_log .debug ('Starting mysqld .' )
55
55
check_output ([
56
- mysql_install_db ,
56
+ mysqld ,
57
+ '--initialize' ,
57
58
'--defaults-file={0}' .format (mysql_defaults_file ),
58
59
'--datadir={0}' .format (mysql_data_dir ),
59
60
'--basedir={0}' .format (mysql_base_dir ),
@@ -65,7 +66,7 @@ def mysql_system_database(
65
66
'Please ensure you disabled apparmor for /run/shm/** or for whole mysql' .format (e = e ))
66
67
raise
67
68
finally :
68
- services_log .debug ('mysql_install_db was executed.' )
69
+ services_log .debug ('mysqld was executed.' )
69
70
70
71
71
72
@pytest .fixture (scope = 'session' )
Original file line number Diff line number Diff line change 9
9
skip_missing_interpreters = true
10
10
11
11
[testenv]
12
- commands = py.test tests --junitxml ={envlogdir}/junit-{envname}.xml
12
+ commands = py.test tests --junitxml ={envlogdir}/junit-{envname}.xml {posargs}
13
13
deps =
14
14
pytestlatest: pytest
15
15
pytest310: pytest~=3.10.0
You can’t perform that action at this time.
0 commit comments