Bug 1630940 - Fix mach interface

Also add some tests to verify the enable telemetry setting
gets picked up

Author: wlach

mozregression/cli.py

@@ -462,7 +462,7 @@ def get_default_date_range(fetch_config):
 
 class Configuration(object):
     """
-    Holds the configuration extracted from the command line.
+    Holds the configuration extracted from the command line + configuration file.
 
     This is usually instantiated by calling :func:`cli`.
 
@@ -479,7 +479,7 @@ class Configuration(object):
                         information about a build
     """
 
-    def __init__(self, options):
+    def __init__(self, options, config):
         self.options = options
         self.logger = init_logger(debug=options.debug)
         # allow to filter process output based on the user option
@@ -501,6 +501,8 @@ def __init__(self, options):
             None if re_ignore_mozversion_line.match(data["message"]) else data
         )
 
+        self.enable_telemetry = config["enable-telemetry"] not in ("no", "false", 0)
+
         self.action = None
         self.fetch_config = None
 
@@ -639,7 +641,6 @@ def cli(argv=None, conf_file=DEFAULT_CONF_FNAME, namespace=None):
         options = namespace
     else:
         options = parse_args(argv=argv, defaults=config)
-        options.enable_telemetry = defaults["enable-telemetry"] not in ("no", "false", 0)
         if not options.cmdargs:
             # we don't set the cmdargs default to be that from the
             # configuration file, because then any new arguments
@@ -656,4 +657,4 @@ def cli(argv=None, conf_file=DEFAULT_CONF_FNAME, namespace=None):
         )
         print("*" * 10)
         print()
-    return Configuration(options)
+    return Configuration(options, config)

mozregression/main.py

@@ -333,7 +333,7 @@ def main(
 
         app = Application(config.fetch_config, config.options)
         send_telemetry_ping_oop(
-            mozregression_variant, config.fetch_config.app_name, config.options.enable_telemetry
+            mozregression_variant, config.fetch_config.app_name, config.enable_telemetry
         )
 
         method = getattr(app, config.action)

tests/unit/test_cli.py

@@ -110,8 +110,8 @@ def test_warn_invalid_build_type_in_conf(self):
         )
 
 
-def do_cli(*argv):
-    conf = cli.cli(argv, conf_file=None)
+def do_cli(*argv, conf_file=None):
+    conf = cli.cli(argv, conf_file=conf_file)
     conf.validate()
     return conf
 
@@ -159,6 +159,8 @@ def test_no_args(os, bits, default_good_date):
         assert config.action == "bisect_nightlies"
         assert config.options.good == default_good_date
         assert config.options.bad == datetime.date.today()
+        # telemetry is by default enabled
+        assert config.enable_telemetry
 
 
 TODAY = datetime.date.today()
@@ -361,3 +363,13 @@ def test_get_default_date_range(app, os, bits, processor, build_type, expected_r
         fetch_config.set_build_type(build_type)
 
     assert expected_range == cli.get_default_date_range(fetch_config)
+
+
+@pytest.mark.parametrize("enable_telemetry", (True, False))
+def test_telemetry(enable_telemetry):
+    with tempfile.NamedTemporaryFile(mode="w", delete=False) as f:
+        f.write("enable-telemetry = %s\n" % ("yes" if enable_telemetry else "no"))
+        f.close()
+        config = do_cli(conf_file=f.name)
+        assert config.enable_telemetry is enable_telemetry
+        os.unlink(f.name)