* Puppet 2.6 fix

This commit is contained in:
Lebedev Vadim 2013-05-21 01:21:38 +04:00
parent 5ea8e5f920
commit a171c52a89
3 changed files with 4 additions and 5 deletions

View file

@ -1,6 +1,5 @@
fixtures:
repositories:
"stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib"
"create_resources": "git://github.com/puppetlabs/puppetlabs-create_resources.git"
symlinks:
"mysql": "#{source_dir}"

View file

@ -125,7 +125,7 @@ class mysql::config(
$log_bin_trust_function_creators = 'UNSET',
$replicate_ignore_table = 'UNSET',
$replicate_wild_do_table = 'UNSET',
$replicate_wild_ignore_table = 'UNSET',
$replicate_wild_ignore_table = 'UNSET'
) inherits mysql::params {
File {

View file

@ -33,7 +33,7 @@ describe 'mysql::config' do
:log_bin_trust_function_creators => 'UNSET',
:replicate_ignore_table => 'UNSET',
:replicate_wild_do_table => 'UNSET',
:replicate_wild_ignore_table => 'UNSET',
:replicate_wild_ignore_table => 'UNSET'
}
end
@ -133,7 +133,7 @@ describe 'mysql::config' do
:tmp_table_size => '4096M',
:max_heap_table_size => '4096M',
:table_open_cache => 2048,
:long_query_time => 0.5,
:long_query_time => 0.5
}
].each do |passed_params|
@ -197,7 +197,7 @@ describe 'mysql::config' do
"query_cache_limit = #{param_values[:query_cache_limit]}",
"query_cache_size = #{param_values[:query_cache_size]}",
"expire_logs_days = #{param_values[:expire_logs_days]}",
"max_binlog_size = #{param_values[:max_binlog_size]}",
"max_binlog_size = #{param_values[:max_binlog_size]}"
]
if param_values[:max_connections] != 'UNSET'
expected_lines = expected_lines | [ "max_connections = #{param_values[:max_connections]}" ]