* Trying fix unit tests for Travis
This commit is contained in:
parent
b07c67ec18
commit
6c81ea0d24
3 changed files with 13 additions and 8 deletions
|
@ -1,5 +1,6 @@
|
|||
fixtures:
|
||||
repositories:
|
||||
"stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib"
|
||||
"create_resources": "git://github.com/puppetlabs/puppetlabs-create_resources.git"
|
||||
symlinks:
|
||||
"mysql": "#{source_dir}"
|
||||
|
|
|
@ -56,7 +56,7 @@ describe 'mysql::config' do
|
|||
:config_file => '/var/db/mysql/my.cnf',
|
||||
:socket => '/tmp/mysql.sock',
|
||||
:pidfile => '/var/db/mysql/mysql.pid',
|
||||
:root_group => 'wheel',
|
||||
:root_group => 'wheel'
|
||||
},
|
||||
'Redhat' => {
|
||||
:datadir => '/var/lib/mysql',
|
||||
|
@ -128,6 +128,9 @@ describe 'mysql::config' do
|
|||
:ssl_ca => '/path/to/cacert.pem',
|
||||
:ssl_cert => '/path/to/server-cert.pem',
|
||||
:ssl_key => '/path/to/server-key.pem',
|
||||
:key_buffer => '16M',
|
||||
:thread_stack => '256K',
|
||||
:query_cache_size => '16M',
|
||||
:character_set => 'utf8',
|
||||
:max_connections => 1000,
|
||||
:tmp_table_size => '4096M',
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
[client]
|
||||
port = <%= port %>
|
||||
socket = <%= socket %>
|
||||
port = <%= @port %>
|
||||
socket = <%= @socket %>
|
||||
<% if @character_set != 'UNSET' -%>
|
||||
default-character-set = <%= @character_set %>
|
||||
<% end %>
|
||||
<% end -%>
|
||||
|
||||
[mysqld_safe]
|
||||
socket = <%= @socket %>
|
||||
nice = 0
|
||||
|
@ -20,7 +21,7 @@ datadir = <%= @datadir %>
|
|||
tmpdir = /tmp
|
||||
skip-external-locking
|
||||
|
||||
<% if bind_address -%>
|
||||
<% if @bind_address -%>
|
||||
bind-address = <%= @bind_address %>
|
||||
<% end -%>
|
||||
key_buffer = <%= @key_buffer %>
|
||||
|
@ -73,10 +74,10 @@ replicate-wild-do-table = <%= @replicate_wild_do_table %>
|
|||
replicate-wild-ignore-table = <%= @replicate_wild_ignore_table %>
|
||||
<% end -%>
|
||||
|
||||
<% if log_error != 'syslog' -%>
|
||||
log_error = <%= log_error %>
|
||||
<% if @log_error != 'syslog' -%>
|
||||
log_error = <%= @log_error %>
|
||||
<% end -%>
|
||||
<% if default_engine != 'UNSET' %>
|
||||
<% if @default_engine != 'UNSET' %>
|
||||
default-storage-engine = <%= @default_engine %>
|
||||
<% end -%>
|
||||
<% if @character_set != 'UNSET' -%>
|
||||
|
|
Loading…
Reference in a new issue