diff --git a/dvc/analytics.py b/dvc/analytics.py index d458fa11d..7565280e7 100644 --- a/dvc/analytics.py +++ b/dvc/analytics.py @@ -201,6 +201,13 @@ class Analytics(object): json.dump(self.info, fobj) return fobj.name + @staticmethod + def _is_enabled_config(config): + from dvc.config import Config + + core = config.config.get(Config.SECTION_CORE, {}) + return core.get(Config.SECTION_CORE_ANALYTICS, True) + @staticmethod def _is_enabled(cmd=None): from dvc.config import Config @@ -226,10 +233,9 @@ class Analytics(object): config = cmd.config assert config is not None - core = config.config.get(Config.SECTION_CORE, {}) - enabled = core.get(Config.SECTION_CORE_ANALYTICS, True) + enabled = Analytics._is_enabled_config(config) logger.debug( - "Analytics is {}abled.".format("en" if enabled else "dis") + "Analytics is {}.".format("enabled" if enabled else "disabled") ) return enabled diff --git a/tests/test_analytics.py b/tests/test_analytics.py index 02ce5a756..364023ed7 100644 --- a/tests/test_analytics.py +++ b/tests/test_analytics.py @@ -27,18 +27,24 @@ class TestAnalytics(TestDir): self.assertNotEqual(a.info[a.PARAM_SYSTEM_INFO], {}) @mock.patch.object(os, "getenv", new=_clean_getenv) + @mock.patch( + "dvc.analytics.Analytics._is_enabled_config", return_value=True + ) @mock.patch("requests.post") - def test_send(self, mockpost): + def test_send(self, mockpost, _): ret = main(["daemon", "analytics", Analytics().dump(), "-v"]) self.assertEqual(ret, 0) self.assertTrue(mockpost.called) @mock.patch.object(os, "getenv", new=_clean_getenv) + @mock.patch( + "dvc.analytics.Analytics._is_enabled_config", return_value=True + ) @mock.patch.object( requests, "post", side_effect=requests.exceptions.RequestException() ) - def test_send_failed(self, mockpost): + def test_send_failed(self, mockpost, _): ret = main(["daemon", "analytics", Analytics().dump(), "-v"]) self.assertEqual(ret, 0)