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

Author: myii

pillar.example

@@ -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.

test/integration/default/controls/command_spec.rb

@@ -9,7 +9,6 @@
 
   # 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

test/salt/pillar/postgres.sls

@@ -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: