Bug 938712 - Dispatch mach test mochitest suites via mach mochitest; r=AutomatedTester

`mach test` now dispatches through `mach mochitest --flavor` where
supported. As part of testing this patch, it was discovered that `mach
test` may have been broken for quite some time, as it was still
referring to "test_file" arguments instead of "test_paths." This has
been corrected.

--HG--
extra : rebase_source : 4a704df0a67bdda575785cb9f27f050f178dc505

testing/mach_commands.py

@@ -68,29 +68,29 @@ TEST_SUITES = {
         'kwargs': {'valgrind': False},
     },
     'mochitest-a11y': {
-        'mach_command': 'mochitest-a11y',
-        'kwargs': {'test_file': None},
+        'mach_command': 'mochitest',
+        'kwargs': {'flavor': 'a11y', 'test_paths': None},
     },
     'mochitest-browser': {
         'aliases': ('bc', 'BC', 'Bc'),
         'mach_command': 'mochitest-browser',
-        'kwargs': {'test_file': None},
+        'kwargs': {'flavor': 'browser-chrome', 'test_paths': None},
     },
     'mochitest-chrome': {
-        'mach_command': 'mochitest-chrome',
-        'kwargs': {'test_file': None},
+        'mach_command': 'mochitest',
+        'kwargs': {'flavor': 'chrome', 'test_paths': None},
     },
     'mochitest-devtools': {
         'aliases': ('dt', 'DT', 'Dt'),
-        'mach_command': 'mochitest-browser --subsuite=devtools',
-        'kwargs': {'test_file': None},
+        'mach_command': 'mochitest-browser',
+        'kwargs': {'subsuite': 'devtools', 'test_paths': None},
     },
     'mochitest-ipcplugins': {
         'make_target': 'mochitest-ipcplugins',
     },
     'mochitest-plain': {
-        'mach_command': 'mochitest-plain',
-        'kwargs': {'test_file': None},
+        'mach_command': 'mochitest',
+        'kwargs': {'flavor': 'mochitest', 'test_paths': None},
     },
     'reftest': {
         'aliases': ('RR', 'rr', 'Rr'),
@@ -117,12 +117,13 @@ TEST_SUITES = {
 for i in range(1, MOCHITEST_TOTAL_CHUNKS + 1):
     TEST_SUITES['mochitest-%d' %i] = {
         'aliases': ('M%d' % i, 'm%d' % i),
-        'mach_command': 'mochitest-plain',
+        'mach_command': 'mochitest',
         'kwargs': {
+            'flavor': 'mochitest',
             'chunk_by_dir': MOCHITEST_CHUNK_BY_DIR,
             'total_chunks': MOCHITEST_TOTAL_CHUNKS,
             'this_chunk': i,
-            'test_file': None,
+            'test_paths': None,
         },
     }