Backed out changeset 7af7d79708de - missing files.
authorAus Lacroix <aus@mozilla.com>
Tue, 15 Sep 2015 11:05:34 -0700
changeset 293497 3f804f1406cae74aafdd6d248d10fc022c1adeb0
parent 293496 7af7d79708dea8fdc670e7c7c5716f8bc8efe674
child 293498 b009d9d173e2b1519e79eb5795c4208b17d5dbf3
push id5485
push userarmenzg@mozilla.com
push dateWed, 16 Sep 2015 18:43:47 +0000
milestone43.0a1
backs out7af7d79708dea8fdc670e7c7c5716f8bc8efe674
Backed out changeset 7af7d79708de - missing files.
testing/mozharness/scripts/gaia_unit.py
testing/taskcluster/tasks/branches/base_jobs.yml
testing/taskcluster/tasks/branches/try/job_flags.yml
--- a/testing/mozharness/scripts/gaia_unit.py
+++ b/testing/mozharness/scripts/gaia_unit.py
@@ -2,19 +2,16 @@
 # ***** BEGIN LICENSE BLOCK *****
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 # ***** END LICENSE BLOCK *****
 
 import os
 import sys
-import glob
-import subprocess
-import json
 
 # load modules from parent dir
 sys.path.insert(1, os.path.dirname(sys.path[0]))
 
 from mozharness.mozilla.testing.gaia_test import GaiaTest
 from mozharness.mozilla.testing.unittest import TestSummaryOutputParserHelper
 
 
@@ -39,58 +36,23 @@ class GaiaUnitTest(GaiaTest):
                        xre_url=self.config.get('xre_url'),
                        debug=True)
 
         # build the testrunner command arguments
         python = self.query_python_path('python')
         cmd = [python, '-u', os.path.join(dirs['abs_runner_dir'],
                                           'gaia_unit_test',
                                           'main.py')]
-        executable = 'firefox'
-        if 'b2g' in self.binary_path:
-                executable = 'b2g-bin'
-
-        profile = os.path.join(dirs['abs_gaia_dir'], 'profile-debug')
-        binary = os.path.join(os.path.dirname(self.binary_path), executable)
+        binary = os.path.join(os.path.dirname(self.binary_path), 'b2g-bin')
         cmd.extend(self._build_arg('--binary', binary))
-        cmd.extend(self._build_arg('--profile', profile))
+        cmd.extend(self._build_arg('--profile', os.path.join(dirs['abs_gaia_dir'],
+                                                             'profile-debug')))
         cmd.extend(self._build_arg('--symbols-path', self.symbols_path))
         cmd.extend(self._build_arg('--browser-arg', self.config.get('browser_arg')))
 
-        # Add support for chunking
-        if self.config.get('total_chunks') and self.config.get('this_chunk'):
-                chunker = [ os.path.join(dirs['abs_gaia_dir'], 'bin', 'chunk'),
-                            self.config.get('total_chunks'), self.config.get('this_chunk') ]
-
-                disabled_tests = []
-                disabled_manifest = os.path.join(dirs['abs_runner_dir'],
-                                                 'gaia_unit_test',
-                                                 'disabled.json')
-                with open(disabled_manifest, 'r') as m:
-                    try:
-                        disabled_tests = json.loads(m.read())
-                    except:
-                        print "Error while decoding disabled.json; please make sure this file has valid JSON syntax."
-                        sys.exit(1)
-
-                # Construct a list of all tests
-                unit_tests  = []
-                for path in ('apps', 'tv_apps'):
-                    test_root    = os.path.join(dirs['abs_gaia_dir'], path)
-                    full_paths   = glob.glob(os.path.join(test_root, '*/test/unit/*_test.js'))
-                    unit_tests  += map(lambda x: os.path.relpath(x, test_root), full_paths)
-
-                # Remove the tests that are disabled
-                active_unit_tests = filter(lambda x: x not in disabled_tests, unit_tests)
-
-                # Chunk the list as requested
-                tests_to_run = subprocess.check_output(chunker + active_unit_tests).strip().split(' ')
-
-                cmd.extend(tests_to_run)
-
         output_parser = TestSummaryOutputParserHelper(config=self.config,
                                                       log_obj=self.log_obj,
                                                       error_list=self.error_list)
 
         upload_dir = self.query_abs_dirs()['abs_blob_upload_dir']
         if not os.path.isdir(upload_dir):
             self.mkdir_p(upload_dir)
 
--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -137,20 +137,16 @@ tests:
   gaia-ui-test-unit:
     allowed_build_tasks:
       tasks/builds/b2g_flame_kk_eng.yml:
         task: tasks/tests/flame_kk_gaia_ui_test_unit.yml
   gaia-unit:
     allowed_build_tasks:
       tasks/builds/b2g_desktop_opt.yml:
         task: tasks/tests/b2g_gaia_unit.yml
-  gaia-unit-oop:
-    allowed_build_tasks:
-      tasks/builds/mulet_linux.yml:
-        task: tasks/tests/mulet_gaia_unit_oop.yml
   marionette:
     allowed_build_tasks:
       tasks/builds/b2g_emulator_ics_opt.yml:
         task: tasks/tests/b2g_emulator_marionette.yml
   marionette-webapi:
     allowed_build_tasks:
       tasks/builds/b2g_emulator_ics_opt.yml:
         task: tasks/tests/b2g_emulator_marionette_webapi.yml
--- a/testing/taskcluster/tasks/branches/try/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/try/job_flags.yml
@@ -236,22 +236,16 @@ tests:
       tasks/builds/b2g_desktop_opt.yml:
         task: tasks/tests/b2g_linter.yml
       tasks/builds/mulet_linux.yml:
         task: tasks/tests/mulet_linter.yml
   gaia-unit:
     allowed_build_tasks:
       tasks/builds/b2g_desktop_opt.yml:
         task: tasks/tests/b2g_gaia_unit.yml
-      tasks/builds/mulet_linux.yml:
-        task: tasks/tests/mulet_gaia_unit.yml
-  gaia-unit-oop:
-    allowed_build_tasks:
-      tasks/builds/mulet_linux.yml:
-        task: tasks/tests/mulet_gaia_unit_oop.yml
   marionette:
     allowed_build_tasks:
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_marionette.yml
       tasks/builds/b2g_emulator_ics_opt.yml:
         task: tasks/tests/b2g_emulator_marionette.yml
   marionette-webapi:
     allowed_build_tasks: