Bug 1075992 - Read in-tree configs if it has not been set through download-and-extract. r=armenzg
authorBob Owen <bobowencode@gmail.com>
Thu, 02 Oct 2014 11:25:36 -0400
changeset 3235 fe6c15736684
parent 3234 9ff10f4f0a59
child 3237 b0b67a625de7
child 3238 573e3991380b
push id2478
push userarmenzg@mozilla.com
push dateThu, 02 Oct 2014 15:25:41 +0000
reviewersarmenzg
bugs1075992
Bug 1075992 - Read in-tree configs if it has not been set through download-and-extract. r=armenzg
mozharness/mozilla/testing/testbase.py
--- a/mozharness/mozilla/testing/testbase.py
+++ b/mozharness/mozilla/testing/testbase.py
@@ -563,16 +563,20 @@ Did you run with --create-virtualenv? Is
             self.run_command(cmd,
                              cwd=dirs['abs_work_dir'],
                              error_list=BaseErrorList,
                              halt_on_failure=suite['halt_on_failure'],
                              fatal_exit_code=suite.get('fatal_exit_code', 3))
 
     def preflight_run_tests(self):
         """preflight commands for all tests"""
+        # If the in tree config hasn't been loaded by a previous step, load it here.
+        if len(self.tree_config) == 0:
+            self._read_tree_config()
+
         c = self.config
         if c.get('run_cmd_checks_enabled'):
             self._run_cmd_checks(c.get('preflight_run_cmd_suites', []))
         elif c.get('preflight_run_cmd_suites'):
             self.warning("Proceeding without running prerun test commands."
                          " These are often OS specific and disabling them may"
                          " result in spurious test results!")