saltstack-formulas/postgres-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/postgres-formula.git synced 2025-04-17 10:10:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test(locale): improve test using locale en_US.UTF-8

Browse source
This commit is contained in:
Imran Iqbal 2019-05-31 00:28:42 +01:00
parent 10126fb740
commit 77960641dd
No known key found for this signature in database
GPG key ID: 6D8629439D2B7819
3 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pillar.example
View file

@ -36,7 +36,7 @@ postgres:
# The default `encoding` is derived from the `locale` so not recommended
# to provide a value for it unless necessary
cluster:
locale: en_GB.UTF-8
locale: en_US.UTF-8
# encoding: UTF8
#'Alternatives system' priority incremental. 0 disables feature.

3
test/integration/default/controls/command_spec.rb
View file

@ -9,7 +9,6 @@ control 'Postgres command' do
# Can't use `%Q` here due to the `\`
describe command(%q{su - postgres -c 'psql -p} + pg_port + %q{ -qtc "\l+ db2"'}) do
its(:stdout) { should match(/.*db2.*my_space/) }
# its(:stdout) { should match(/db2.*remoteUser.*UTF8.*en_US\.UTF-8.*en_US\.UTF-8.*my_space/) }
its(:stdout) { should match(/db2.*remoteUser.*UTF8.*en_US\.UTF-8.*en_US\.UTF-8.*my_space/) }
end
end

34
test/salt/pillar/postgres.sls
View file

@ -42,13 +42,13 @@ postgres:
# - postgresql-contrib
# - postgresql-plpython
# # CLUSTER
# # The default `encoding` is derived from the `locale` so not recommended
# # to provide a value for it unless necessary
# cluster:
# locale: en_GB.UTF-8
# # encoding: UTF8
#
# CLUSTER
# The default `encoding` is derived from the `locale` so not recommended
# to provide a value for it unless necessary
cluster:
locale: en_US.UTF-8
# encoding: UTF8
# #'Alternatives system' priority incremental. 0 disables feature.
# linux:
# altpriority: 30
@ -166,20 +166,20 @@ postgres:
# databases to be created
databases:
db1:
owner: 'localUser'
# template: 'template0'
# lc_ctype: 'en_US.UTF-8'
# lc_collate: 'en_US.UTF-8'
owner: localUser
template: template0
lc_ctype: en_US.UTF-8
lc_collate: en_US.UTF-8
db2:
owner: 'remoteUser'
# template: 'template0'
# lc_ctype: 'en_US.UTF-8'
# lc_collate: 'en_US.UTF-8'
tablespace: 'my_space'
owner: remoteUser
template: template0
lc_ctype: en_US.UTF-8
lc_collate: en_US.UTF-8
tablespace: my_space
# set custom schema
schemas:
public:
owner: 'localUser'
owner: localUser
# enable per-db extension
{%- if grains.os_family == 'Debian' and grains.osfinger != 'Debian-8' %}
extensions: