Skip to content

Commit 764a7cf

Browse files
committed
attempting to fix bad locale variables
1 parent e73d5b3 commit 764a7cf

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

spec/acceptance/00_mysql_server_spec.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# The export_locales method conflicts with our testing when the target system uses MariaDB, therefore it is being disabled for those systems.
66
# if os[:family] != 'debian' && os[:family] != 'ubuntu'
7-
# export_locales
7+
export_locales
88
# end
99

1010
describe 'mysql class' do
@@ -60,9 +60,7 @@ class { 'mysql::server':
6060
class { '::mysql::server':
6161
override_options => {
6262
'mysqld' => {
63-
'log-bin' => '/var/log/mariadb/mariadb-bin.log',},
64-
'LANG' => 'C',
65-
'LC_ALL' => 'C'
63+
'log-bin' => '/var/log/mariadb/mariadb-bin.log',}
6664
}
6765
}
6866
MANIFEST

spec/spec_helper_acceptance_local.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ def mysql_version
2020
end
2121

2222
def export_locales
23-
LitmusHelper.instance.run_shell('echo export PATH="/opt/puppetlabs/bin:$PATH" > ~/.bashrc')
24-
LitmusHelper.instance.run_shell('echo export LC_ALL="C" > /etc/profile.d/my-custom.lang.sh')
23+
LitmusHelper.instance.run_shell('echo export PATH=/opt/puppetlabs/bin:$PATH > ~/.bashrc')
24+
LitmusHelper.instance.run_shell('echo export LC_ALL=C > /etc/profile.d/my-custom.lang.sh')
2525
LitmusHelper.instance.run_shell('echo "## US English ##" >> /etc/profile.d/my-custom.lang.sh')
26-
LitmusHelper.instance.run_shell('echo export LANG="en_US.UTF-8" >> /etc/profile.d/my-custom.lang.sh')
27-
LitmusHelper.instance.run_shell('echo export LANGUAGE="en_US.UTF-8" >> /etc/profile.d/my-custom.lang.sh')
26+
LitmusHelper.instance.run_shell('echo export LANG=C >> /etc/profile.d/my-custom.lang.sh')
27+
LitmusHelper.instance.run_shell('echo export LANGUAGE=C >> /etc/profile.d/my-custom.lang.sh')
2828
LitmusHelper.instance.run_shell('echo export LC_COLLATE=C >> /etc/profile.d/my-custom.lang.sh')
29-
LitmusHelper.instance.run_shell('echo export LC_CTYPE="en_US.UTF-8" >> /etc/profile.d/my-custom.lang.sh')
29+
LitmusHelper.instance.run_shell('echo export LC_CTYPE=C >> /etc/profile.d/my-custom.lang.sh')
3030
LitmusHelper.instance.run_shell('. /etc/profile.d/my-custom.lang.sh')
31-
LitmusHelper.instance.run_shell('echo export LC_ALL="C" >> ~/.bashrc')
31+
LitmusHelper.instance.run_shell('echo export LC_ALL=C >> ~/.bashrc')
3232
LitmusHelper.instance.run_shell('. ~/.bashrc')
3333
end
3434

0 commit comments

Comments
 (0)