Backed out changeset 39706085e808 (bug 1477433) for lining failure. CLOSED TREE
authorDorel Luca <dluca@mozilla.com>
Wed, 14 Nov 2018 19:32:15 +0200
changeset 502644 9c50102149e038a64843f6f38a436c82aeaa58fe
parent 502643 17cb306575a640b92d50ccd7d49b2810fbedc9e0
child 502645 02ea631f55c3ad689fff3e24df75e810cbe042ad
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1477433
milestone65.0a1
backs out39706085e80850e86e77ff4b5f70ed69d7288782
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 39706085e808 (bug 1477433) for lining failure. CLOSED TREE
toolkit/components/telemetry/build_scripts/mozparsers/parse_histograms.py
toolkit/components/telemetry/tests/python/python.ini
toolkit/components/telemetry/tests/python/test_usecounters.py
--- a/toolkit/components/telemetry/build_scripts/mozparsers/parse_histograms.py
+++ b/toolkit/components/telemetry/build_scripts/mozparsers/parse_histograms.py
@@ -128,17 +128,16 @@ definition is a dict-like object that mu
  - 'description': A textual description of the histogram.
  - 'strict_type_checks': A boolean indicating whether to use the new, stricter type checks.
                          The server-side still has to deal with old, oddly typed submissions,
                          so we have to skip them there by default."""
         self._strict_type_checks = strict_type_checks
         self._is_use_counter = name.startswith("USE_COUNTER2_")
         if self._is_use_counter:
             definition.setdefault('record_in_processes', ['main', 'content'])
-            definition.setdefault('releaseChannelCollection', 'opt-out')
         self.verify_attributes(name, definition)
         self._name = name
         self._description = definition['description']
         self._kind = definition['kind']
         self._keys = definition.get('keys', [])
         self._keyed = definition.get('keyed', False)
         self._expiration = definition.get('expires_in_version')
         self._labels = definition.get('labels', [])
--- a/toolkit/components/telemetry/tests/python/python.ini
+++ b/toolkit/components/telemetry/tests/python/python.ini
@@ -1,9 +1,8 @@
 [DEFAULT]
 skip-if = python == 3
 
 [test_gen_event_data_json.py]
 [test_gen_scalar_data_json.py]
 [test_histogramtools_non_strict.py]
 [test_histogramtools_strict.py]
 [test_parse_scalars.py]
-[test_usecounters.py]
deleted file mode 100644
--- a/toolkit/components/telemetry/tests/python/test_usecounters.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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/.
-
-import mozunit
-import sys
-import unittest
-from os import path
-from test_histogramtools_non_strict import load_histogram
-
-TELEMETRY_ROOT_PATH = path.abspath(path.join(path.dirname(__file__), path.pardir, path.pardir))
-sys.path.append(TELEMETRY_ROOT_PATH)
-# The parsers live in a subdirectory of "build_scripts", account for that.
-# NOTE: if the parsers are moved, this logic will need to be updated.
-sys.path.append(path.join(TELEMETRY_ROOT_PATH, "build_scripts"))
-from mozparsers.shared_telemetry_utils import ParserError
-from mozparsers import parse_histograms
-
-
-class TestParser(unittest.TestCase):
-    def test_usecounter_collection_enabled(self):
-        SAMPLE_HISTOGRAM = {
-            "USE_COUNTER2_TEST_HISTOGRAM": {
-                "expires_in_version": "never",
-                "kind": "boolean",
-                "description": "Whether a foo used bar"
-            }
-        }
-        histograms = load_histogram(SAMPLE_HISTOGRAM)
-        parse_histograms.load_whitelist()
-
-        hist = parse_histograms.Histogram('USE_COUNTER2_TEST_HISTOGRAM',
-                                          histograms['USE_COUNTER2_TEST_HISTOGRAM'],
-                                          strict_type_checks=True)
-
-        ParserError.exit_func()
-        self.assertEquals(hist.dataset(), "nsITelemetry::DATASET_RELEASE_CHANNEL_OPTOUT")
-
-    def test_usecounter_histogram(self):
-        SAMPLE_HISTOGRAM = {
-            "USE_COUNTER2_TEST_HISTOGRAM": {
-                "expires_in_version": "never",
-                "kind": "boolean",
-                "description": "Whether a foo used bar"
-            }
-        }
-        histograms = load_histogram(SAMPLE_HISTOGRAM)
-        parse_histograms.load_whitelist()
-
-        hist = parse_histograms.Histogram('USE_COUNTER2_TEST_HISTOGRAM',
-                                          histograms['USE_COUNTER2_TEST_HISTOGRAM'],
-                                          strict_type_checks=True)
-
-        ParserError.exit_func()
-        self.assertEquals(hist.expiration(), "never")
-        self.assertEquals(hist.kind(), "boolean")
-        self.assertEquals(hist.description(), "Whether a foo used bar")
-
-if __name__ == '__main__':
-    mozunit.main()