Bug 1429158 - Ensure 'six' and 'mozterm' are available from the one-click-loaner mach environment, r=jmaher

Mach itself now depends on 'six', so it needs to be packaged in the test archive.

MozReview-Commit-ID: 8lWc0cxwrss

--HG--
extra : rebase_source : fc25b5dec23d0864905ebb116114b5ef37f0595b

python/mozbuild/mozbuild/action/test_archive.py

@@ -226,6 +226,12 @@ ARCHIVE_FILES = {
             'pattern': '**',
             'dest': 'tools/mozterm',
         },
+        {
+            'source': buildconfig.topsrcdir,
+            'base': 'third_party/python/six',
+            'pattern': '**',
+            'dest': 'tools/six',
+        },
         {
             'source': buildconfig.topobjdir,
             'base': '',

testing/tools/mach_test_package_bootstrap.py

@@ -36,6 +36,8 @@ SEARCH_PATHS = [
     'mozbase/mozversion',
     'reftest',
     'tools/mach',
+    'tools/mozterm',
+    'tools/six',
     'tools/wptserve',
     'web-platform',
     'web-platform/tests/tools/wptrunner',