Skip to content

Commit dc47842

Browse files
author
David Swan
committed
(MODULES-7353) Debian 9 test fix
1 parent 25b1b00 commit dc47842

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

spec/acceptance/locales_spec.rb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010
end
1111

1212
context 'when triggering puppet simple string error' do
13+
# 'service_enabled' being set to false can cause random failures in Debian 9
14+
let(:os_variant) do
15+
if fact('operatingsystem') =~ %r{Debian} && fact('operatingsystemrelease') =~ %r{^9\.}
16+
'true'
17+
else
18+
'false'
19+
end
20+
end
1321
let(:pp) do
1422
<<-MANIFEST
1523
class { 'mysql::server':
@@ -24,7 +32,7 @@ class { 'mysql::server':
2432
root_group => 'root',
2533
root_password => 'test',
2634
old_root_password => 'kittensnmittens',
27-
service_enabled => 'false'
35+
service_enabled => '#{os_variant}',
2836
}
2937
MANIFEST
3038
end

spec/acceptance/mysql_server_spec.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ 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'
53+
# 'manage_config_file'/'service_enabled' being set to false can cause random failures in Debian 9
54+
let(:os_variant) do
55+
if fact('operatingsystem') =~ %r{Debian} && fact('operatingsystemrelease') =~ %r{^9\.}
5656
'true'
5757
else
5858
'false'
@@ -61,15 +61,15 @@ class { 'mysql::server':
6161
let(:pp) do
6262
<<-MANIFEST
6363
class { 'mysql::server':
64-
manage_config_file => '#{manage_config_file}',
64+
manage_config_file => '#{os_variant}',
6565
override_options => { 'mysqld' => { 'key_buffer_size' => '32M' }},
6666
package_ensure => 'present',
6767
purge_conf_dir => 'false',
6868
remove_default_accounts => 'false',
6969
restart => 'false',
7070
root_group => 'root',
7171
root_password => 'test',
72-
service_enabled => 'false',
72+
service_enabled => '#{os_variant}',
7373
service_manage => 'false',
7474
users => {},
7575
grants => {},

0 commit comments

Comments
 (0)