15044: Specify test database collation.

apps/workbench/test/controllers/projects_controller_test.rb:546 fails
with other collations.

Remove obsolete websocket comment.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/services/api/config/database.yml.example b/services/api/config/database.yml.example
index 80876888cf53eb512085dd88641b3388cfe0c814..2ec90050ae74ee88158d19d8a68581f17e3a9bd9 100644 (file)
--- a/services/api/config/database.yml.example
+++ b/services/api/config/database.yml.example
@@ -15,6 +15,7 @@ test:
   adapter: postgresql
   template: template0
   encoding: utf8
+  collation: en_US.utf8
   database: arvados_test
   username: arvados
   password: xxxxxxxx
@@ -28,7 +29,4 @@ production:
   username: arvados
   password: xxxxxxxx
   host: localhost
-  # For the websockets server, prefer a larger database connection pool size since it
-  # multithreaded and can serve a large number of long-lived clients.  See also
-  # websocket_max_connections configuration option.
   pool: 50