Manually merged #30 to fix conflicts and fixed test fixtures.

Author: marcelduran

lib/mapping.js

@@ -371,19 +371,24 @@ var options = {
       param: 'id',
       info: 'test name to use when submitting results to tsviewdb (for private instances that have integrated with tsviewdb)'
     },
+    'tsviewconfigs': {
+      name: 'tsViewConfigs',
+      api: 'tsview_configs',
+      param: 'string',
+      info: 'configs to use when submitting results to tsviewdb (for private instances that have integrated with tsviewdb)'
+    },
     'affinity': {
       name: 'affinity',
       api: 'affinity',
       param: 'string',
       info: 'string to hash test to a specific test agent. tester will be picked by index among available testers'
     },
-    'tsviewconfigs': {
-      name: 'tsViewConfigs',
-      api: 'tsview_configs',
+    'priority': {
+      name: 'priority',
+      api: 'priority',
       param: 'string',
-      info: 'configs to use when submitting results to tsviewdb (for private instances that have integrated with tsviewdb)'
+      info: 'change test priority'
     },
-
     // Undocumented/experimental/transitent/deprecated
     'noads': {
       name: 'blockAds',

test/fixtures/command-line/help-test.txt

@@ -52,7 +52,9 @@
     -A, --medianvideo             store the video from the median run when capturing video is enabled
         --htmlbody                save the content of only the base HTML response
         --tsview <id>             test name to use when submitting results to tsviewdb (for private instances that have integrated with tsviewdb)
+        --tsviewconfigs <string>  configs to use when submitting results to tsviewdb (for private instances that have integrated with tsviewdb)
         --affinity <string>       string to hash test to a specific test agent. tester will be picked by index among available testers
+        --priority <string>       change test priority
         --noads                   block ads defined by adblockrules.org
         --continuous              capture video continuously (unstable/experimental, may cause tests to fail)
         --spdy3                   force SPDY version 3 (Chrome only)

test/fixtures/command-line/help.txt

@@ -80,7 +80,7 @@
 
     -h, --help             output usage information
     -V, --version          output the version number
-    -s, --server <server>  the WPT server URL [http://www.webpagetest.org]
+    -s, --server <server>  the WPT server URL [latencylab.corp.google.com]
     -d, --dryrun           just return the RESTful API URL
     -o, --out <file>       place the output into <file>. Defaults to stdout