Skip to content

Commit 0915ae1

Browse files
authored
Merge pull request #1088 from puppetlabs/FM-7045
[FM-7045] Fix to allow Debian 9 test's to run clean
2 parents 1ebe0ec + d94a265 commit 0915ae1

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

spec/acceptance/mysql_server_spec.rb

+9-2
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,18 @@ class { 'mysql::server':
5050
before(:all) do
5151
@tmpdir = default.tmpdir('mysql')
5252
end
53+
# 'manage_config_file' being set to false can cause random failures in Debian 9
54+
let(:manage_config_file) do
55+
if fact('operatingsystem') == 'Debian' && fact('operatingsystemrelease') == '9'
56+
'true'
57+
else
58+
'false'
59+
end
60+
end
5361
let(:pp) do
5462
<<-MANIFEST
5563
class { 'mysql::server':
56-
manage_config_file => 'false',
64+
manage_config_file => '#{manage_config_file}',
5765
override_options => { 'mysqld' => { 'key_buffer_size' => '32M' }},
5866
package_ensure => 'present',
5967
purge_conf_dir => 'false',
@@ -72,7 +80,6 @@ class { 'mysql::server':
7280

7381
it_behaves_like 'a idempotent resource'
7482
end
75-
# rubocop:enable RSpec/InstanceVariable
7683

7784
describe 'syslog configuration' do
7885
let(:pp) do

0 commit comments

Comments
 (0)