Bug 1109114 - Gip mozharness config should have default chunks of 1 r=jgriffin
authorZac Campbell <zcampbell@mozilla.com>
Tue, 09 Dec 2014 18:11:04 +0000 (2014-12-09)
changeset 3456 974ed06d29fb65e98def60de297e6ab5ad02842a
parent 3455 30247a28bfd509ed059977363c0ea1cc15f3112e
child 3458 95d3f73dcefc8df8d35b6fb2fa0bb46da974d11d
push id2679
push userjgriffin@mozilla.com
push dateWed, 10 Dec 2014 21:49:37 +0000 (2014-12-10)
reviewersjgriffin
bugs1109114
Bug 1109114 - Gip mozharness config should have default chunks of 1 r=jgriffin
scripts/marionette.py
--- a/scripts/marionette.py
+++ b/scripts/marionette.py
@@ -429,16 +429,20 @@ class MarionetteTest(TestingMixin, Toolt
                     config_fmt_args['binary'] = os.path.join(binary_path, 'b2g-bin')
                 else:
                     # if b2g-bin cannot be found we must use just b2g
                     config_fmt_args['binary'] = os.path.join(binary_path, 'b2g')
 
             if self.config.get('this_chunk') and self.config.get('total_chunks'):
                 config_fmt_args['this_chunk'] = self.config.get('this_chunk')
                 config_fmt_args['total_chunks'] = self.config.get('total_chunks')
+            else:
+                # pass 1 as default so that the config option is honoured
+                config_fmt_args['this_chunk'] = 1
+                config_fmt_args['total_chunks'] = 1
 
             # Bug 1046694
             # using a different manifest if a specific gip-suite is specified
             # --type parameter depends on gip-suite
             if self.config.get('gip_suite'):
                 manifest = os.path.join(dirs['abs_gaiatest_dir'], 'gaiatest', 'tests', self.config.get('gip_suite'),
                                         'manifest.ini')
                 if self.config.get('gip_suite') == "functional":