Bug 1239988 - Move resources for firefox-ui-tests out of tests folder. r=maja_zf

MozReview-Commit-ID: KtUiswz9gna

The resources folder should actually not be part of the tests folder. It contains test data for all tests and once tests are moved to other places the tests folder will not exist anymore.

--HG--
rename : testing/firefox-ui/tests/resources/cookies/cookie_single.html => testing/firefox-ui/resources/cookies/cookie_single.html
rename : testing/firefox-ui/tests/resources/images/firefox_favicon.ico => testing/firefox-ui/resources/images/firefox_favicon.ico
rename : testing/firefox-ui/tests/resources/images/mozilla_favicon.ico => testing/firefox-ui/resources/images/mozilla_favicon.ico
rename : testing/firefox-ui/tests/resources/images/mozilla_logo.jpg => testing/firefox-ui/resources/images/mozilla_logo.jpg
rename : testing/firefox-ui/tests/resources/layout/mozilla.html => testing/firefox-ui/resources/layout/mozilla.html
rename : testing/firefox-ui/tests/resources/layout/mozilla_community.html => testing/firefox-ui/resources/layout/mozilla_community.html
rename : testing/firefox-ui/tests/resources/layout/mozilla_contribute.html => testing/firefox-ui/resources/layout/mozilla_contribute.html
rename : testing/firefox-ui/tests/resources/layout/mozilla_governance.html => testing/firefox-ui/resources/layout/mozilla_governance.html
rename : testing/firefox-ui/tests/resources/layout/mozilla_grants.html => testing/firefox-ui/resources/layout/mozilla_grants.html
rename : testing/firefox-ui/tests/resources/layout/mozilla_mission.html => testing/firefox-ui/resources/layout/mozilla_mission.html
rename : testing/firefox-ui/tests/resources/layout/mozilla_organizations.html => testing/firefox-ui/resources/layout/mozilla_organizations.html
rename : testing/firefox-ui/tests/resources/layout/mozilla_projects.html => testing/firefox-ui/resources/layout/mozilla_projects.html
rename : testing/firefox-ui/tests/resources/private_browsing/about.html => testing/firefox-ui/resources/private_browsing/about.html
rename : testing/firefox-ui/tests/resources/security/enable_privilege.html => testing/firefox-ui/resources/security/enable_privilege.html
extra : rebase_source : 722311a780f6e36ef4f2e08b82117fdf78625620

testing/firefox-ui/mach_commands.py

@@ -49,15 +49,15 @@ def run_firefox_ui_test(testtype=None, topsrcdir=None, **kwargs):
         }
     }
 
-    tests_root = os.path.join(topsrcdir, 'testing', 'firefox-ui', 'tests')
+    fxui_dir = os.path.join(topsrcdir, 'testing', 'firefox-ui')
 
     # Set the resources path which is used to serve test data via wptserve
     if not kwargs['server_root']:
-        kwargs['server_root'] = os.path.join(tests_root, 'resources')
+        kwargs['server_root'] = os.path.join(fxui_dir, 'resources')
 
     # If no tests have been selected, set default ones
     if not kwargs.get('tests'):
-        kwargs['tests'] = [os.path.join(tests_root, test)
+        kwargs['tests'] = [os.path.join(fxui_dir, 'tests', test)
                            for test in test_types[testtype]['default_tests']]
 
     kwargs['logger'] = commandline.setup_logging('Firefox UI - {} Tests'.format(testtype),

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

@@ -213,7 +213,7 @@ class FirefoxUITests(TestingMixin, VCSToolsScript):
         dirs = {
             'abs_reports_dir': os.path.join(abs_dirs['base_work_dir'], 'reports'),
             'abs_test_install_dir': abs_tests_install_dir,
-            'abs_fxui_tests_dir': os.path.join(abs_tests_install_dir, 'firefox-ui', 'tests'),
+            'abs_fxui_dir': os.path.join(abs_tests_install_dir, 'firefox-ui'),
         }
 
         for key in dirs:
@@ -303,7 +303,7 @@ class FirefoxUITests(TestingMixin, VCSToolsScript):
             '--address', 'localhost:{}'.format(marionette_port),
 
             # Resource files to serve via local webserver
-            '--server-root', os.path.join(dirs['abs_fxui_tests_dir'], 'resources'),
+            '--server-root', os.path.join(dirs['abs_fxui_dir'], 'resources'),
 
             # Use the work dir to get temporary data stored
             '--workspace', dirs['abs_work_dir'],
@@ -334,7 +334,7 @@ class FirefoxUITests(TestingMixin, VCSToolsScript):
                                         strict=False)
 
         # Add the top-level tests manifest file
-        cmd.append(os.path.join(dirs['abs_fxui_tests_dir'], self.tests_manifest))
+        cmd.append(os.path.join(dirs['abs_fxui_dir'], 'tests', self.tests_manifest))
 
         return_code = self.run_command(cmd,
                                        cwd=dirs['abs_work_dir'],