Merge pull request #1561 from mozilla/issue-1560

can now set MYSQL_PASSWORD in env

docs/TESTING.md

@@ -4,6 +4,13 @@
 
 Developer tests should be run before committing code. There are two test suites.
 
-  # `npm test`
+  - `npm test`
 
-  # Load http://localhost:10002/test/index.html into a world wide web browser
+  - Load http://localhost:10002/test/index.html into a world wide web browser
+
+Note that for mysql, you will need to grant `browserid` privileges to create tables.
+You can then run the mysql suite with, e.g., 
+
+    NODE_ENV=test_mysql MYSQL_USER=browserid MYSQL_PASSWORD=browserid npm test
+
+  

lib/configuration.js

@@ -93,7 +93,10 @@ var conf = module.exports = convict({
       format: 'string?',
       env: 'DATABASE_NAME'
     },
-    password: 'string?',
+    password: {
+      format: 'string?',
+      env: 'MYSQL_PASSWORD'
+    },
     host: 'string?',
     max_query_time_ms: {
       format: 'integer = 5000',