Bug 1239988 - Remove top-level manifest for functional and puppeteer tests. r=maja_zf

MozReview-Commit-ID: BNzYwTbWcb9

This was always a hack which made it easier for us to trigger both type of tests at once. Now with mach and mozharness we should finally get rid of it.

--HG--
extra : rebase_source : 83bbc17a257e5135a1d0a6fd3f370c99223b150b

testing/firefox-ui/mach_commands.py

@@ -37,7 +37,8 @@ def run_firefox_ui_test(testtype=None, topsrcdir=None, **kwargs):
     test_types = {
         'functional': {
             'default_tests': [
-                'manifest.ini',
+                os.path.join('puppeteer', 'manifest.ini'),
+                os.path.join('functional', 'manifest.ini'),
             ],
             'cli_module': firefox_ui_harness.cli_functional,
         },

testing/firefox-ui/tests/manifest.ini

@@ -1,2 +0,0 @@
-[include:puppeteer/manifest.ini]
-[include:functional/manifest.ini]

testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py

@@ -333,8 +333,9 @@ class FirefoxUITests(TestingMixin, VCSToolsScript):
                                         log_obj=self.log_obj,
                                         strict=False)
 
-        # Add the top-level tests manifest file
-        cmd.append(os.path.join(dirs['abs_fxui_dir'], 'tests', self.tests_manifest))
+        # Add the default tests to run
+        tests = [os.path.join(dirs['abs_fxui_dir'], 'tests', test) for test in self.default_tests]
+        cmd.extend(tests)
 
         return_code = self.run_command(cmd,
                                        cwd=dirs['abs_work_dir'],
@@ -411,13 +412,18 @@ class FirefoxUITests(TestingMixin, VCSToolsScript):
 class FirefoxUIFunctionalTests(FirefoxUITests):
 
     cli_script = 'cli_functional.py'
-    tests_manifest = 'manifest.ini'
+    default_tests = [
+        os.path.join('puppeteer', 'manifest.ini'),
+        os.path.join('functional', 'manifest.ini'),
+    ]
 
 
 class FirefoxUIUpdateTests(FirefoxUITests):
 
     cli_script = 'cli_update.py'
-    tests_manifest = os.path.join('update', 'manifest.ini')
+    default_tests = [
+        os.path.join('update', 'manifest.ini')
+    ]
 
     def __init__(self, config_options=None, *args, **kwargs):
         config_options = config_options or firefox_ui_update_config_options