You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
depot_tools/tests/metrics_xml_format_test.py

125 lines
4.4 KiB
Python

#!/usr/bin/env vpython3
# coding=utf-8
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import os
import sys
import unittest
from unittest import mock
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import gclient_paths_test
import metrics_xml_format
Reland "Support formatting metrics xml(s) in the subfolders." This reverts commit bfe1a9282dd124d0748145995602880b0dbf92b5. Reason for revert: reland with a fix. - Find the diff between ps#1 and ps#2. - Tested at https://paste.googleplex.com/4670451708854272 Original change's description: > Revert "Support formatting metrics xml(s) in the subfolders." > > This reverts commit 597ba08be5eb953914ba48d2dc85f1f41dbbec31. > > Reason for revert: it broke git_cl.py. Need further patch > > Original change's description: > > Support formatting metrics xml(s) in the subfolders. > > > > https://crrev.com/c/6072565 assumed that the XMLs are located under > > tools/metrics/{actions,ukm,structured,histograms} directly, such as > > tools/metrics/histograms/enums.xml. > > > > However, its subfolders may have XML files, and it should format > > the files. This CL fixes it. > > > > Bug: 384940858 > > Change-Id: I56484144e6f72f41eb5bc37a5ad462a0de1ec0e3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111994 > > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> > > Auto-Submit: Scott Lee <ddoman@chromium.org> > > Commit-Queue: Scott Lee <ddoman@chromium.org> > > Bug: 384940858 > Change-Id: I322573ad6d2d758cd3d2de872efdbba4fd9330c2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111996 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Scott Lee <ddoman@chromium.org> Bug: 384940858 Change-Id: Ibe20d5e46c519d7fdbd1114565ec3856e5bf928e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111997 Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Scott Lee <ddoman@chromium.org>
2 months ago
norm = lambda path: os.path.join(*path.split('/'))
class TestBase(gclient_paths_test.TestBase):
def setUp(self):
super().setUp()
# os.path.realpath() doesn't seem to use os.path.getcwd() to compute
# the realpath of a given path.
#
# This mock os.path.realpath such that it uses the mocked getcwd().
mock.patch('os.path.realpath', self.realpath).start()
# gclient_paths.GetPrimarysolutionPath() defaults to src.
self.make_file_tree({'.gclient': ''})
Reland "Support formatting metrics xml(s) in the subfolders." This reverts commit bfe1a9282dd124d0748145995602880b0dbf92b5. Reason for revert: reland with a fix. - Find the diff between ps#1 and ps#2. - Tested at https://paste.googleplex.com/4670451708854272 Original change's description: > Revert "Support formatting metrics xml(s) in the subfolders." > > This reverts commit 597ba08be5eb953914ba48d2dc85f1f41dbbec31. > > Reason for revert: it broke git_cl.py. Need further patch > > Original change's description: > > Support formatting metrics xml(s) in the subfolders. > > > > https://crrev.com/c/6072565 assumed that the XMLs are located under > > tools/metrics/{actions,ukm,structured,histograms} directly, such as > > tools/metrics/histograms/enums.xml. > > > > However, its subfolders may have XML files, and it should format > > the files. This CL fixes it. > > > > Bug: 384940858 > > Change-Id: I56484144e6f72f41eb5bc37a5ad462a0de1ec0e3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111994 > > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> > > Auto-Submit: Scott Lee <ddoman@chromium.org> > > Commit-Queue: Scott Lee <ddoman@chromium.org> > > Bug: 384940858 > Change-Id: I322573ad6d2d758cd3d2de872efdbba4fd9330c2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111996 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Scott Lee <ddoman@chromium.org> Bug: 384940858 Change-Id: Ibe20d5e46c519d7fdbd1114565ec3856e5bf928e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111997 Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Scott Lee <ddoman@chromium.org>
2 months ago
self.cwd = os.path.join(self.cwd, 'src')
def realpath(self, path):
if os.path.isabs(path):
return path
Reland "Support formatting metrics xml(s) in the subfolders." This reverts commit bfe1a9282dd124d0748145995602880b0dbf92b5. Reason for revert: reland with a fix. - Find the diff between ps#1 and ps#2. - Tested at https://paste.googleplex.com/4670451708854272 Original change's description: > Revert "Support formatting metrics xml(s) in the subfolders." > > This reverts commit 597ba08be5eb953914ba48d2dc85f1f41dbbec31. > > Reason for revert: it broke git_cl.py. Need further patch > > Original change's description: > > Support formatting metrics xml(s) in the subfolders. > > > > https://crrev.com/c/6072565 assumed that the XMLs are located under > > tools/metrics/{actions,ukm,structured,histograms} directly, such as > > tools/metrics/histograms/enums.xml. > > > > However, its subfolders may have XML files, and it should format > > the files. This CL fixes it. > > > > Bug: 384940858 > > Change-Id: I56484144e6f72f41eb5bc37a5ad462a0de1ec0e3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111994 > > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> > > Auto-Submit: Scott Lee <ddoman@chromium.org> > > Commit-Queue: Scott Lee <ddoman@chromium.org> > > Bug: 384940858 > Change-Id: I322573ad6d2d758cd3d2de872efdbba4fd9330c2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111996 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Scott Lee <ddoman@chromium.org> Bug: 384940858 Change-Id: Ibe20d5e46c519d7fdbd1114565ec3856e5bf928e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111997 Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Scott Lee <ddoman@chromium.org>
2 months ago
return os.path.join(self.getcwd(), path)
class GetMetricsDirTest(TestBase):
def testWithAbsolutePath(self):
Reland "Support formatting metrics xml(s) in the subfolders." This reverts commit bfe1a9282dd124d0748145995602880b0dbf92b5. Reason for revert: reland with a fix. - Find the diff between ps#1 and ps#2. - Tested at https://paste.googleplex.com/4670451708854272 Original change's description: > Revert "Support formatting metrics xml(s) in the subfolders." > > This reverts commit 597ba08be5eb953914ba48d2dc85f1f41dbbec31. > > Reason for revert: it broke git_cl.py. Need further patch > > Original change's description: > > Support formatting metrics xml(s) in the subfolders. > > > > https://crrev.com/c/6072565 assumed that the XMLs are located under > > tools/metrics/{actions,ukm,structured,histograms} directly, such as > > tools/metrics/histograms/enums.xml. > > > > However, its subfolders may have XML files, and it should format > > the files. This CL fixes it. > > > > Bug: 384940858 > > Change-Id: I56484144e6f72f41eb5bc37a5ad462a0de1ec0e3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111994 > > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> > > Auto-Submit: Scott Lee <ddoman@chromium.org> > > Commit-Queue: Scott Lee <ddoman@chromium.org> > > Bug: 384940858 > Change-Id: I322573ad6d2d758cd3d2de872efdbba4fd9330c2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111996 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Scott Lee <ddoman@chromium.org> Bug: 384940858 Change-Id: Ibe20d5e46c519d7fdbd1114565ec3856e5bf928e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111997 Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Scott Lee <ddoman@chromium.org>
2 months ago
top = self.getcwd()
get = lambda path: metrics_xml_format.GetMetricsDir(
top, os.path.join(top, norm(path)))
Reland "Support formatting metrics xml(s) in the subfolders." This reverts commit bfe1a9282dd124d0748145995602880b0dbf92b5. Reason for revert: reland with a fix. - Find the diff between ps#1 and ps#2. - Tested at https://paste.googleplex.com/4670451708854272 Original change's description: > Revert "Support formatting metrics xml(s) in the subfolders." > > This reverts commit 597ba08be5eb953914ba48d2dc85f1f41dbbec31. > > Reason for revert: it broke git_cl.py. Need further patch > > Original change's description: > > Support formatting metrics xml(s) in the subfolders. > > > > https://crrev.com/c/6072565 assumed that the XMLs are located under > > tools/metrics/{actions,ukm,structured,histograms} directly, such as > > tools/metrics/histograms/enums.xml. > > > > However, its subfolders may have XML files, and it should format > > the files. This CL fixes it. > > > > Bug: 384940858 > > Change-Id: I56484144e6f72f41eb5bc37a5ad462a0de1ec0e3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111994 > > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> > > Auto-Submit: Scott Lee <ddoman@chromium.org> > > Commit-Queue: Scott Lee <ddoman@chromium.org> > > Bug: 384940858 > Change-Id: I322573ad6d2d758cd3d2de872efdbba4fd9330c2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111996 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Scott Lee <ddoman@chromium.org> Bug: 384940858 Change-Id: Ibe20d5e46c519d7fdbd1114565ec3856e5bf928e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111997 Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Scott Lee <ddoman@chromium.org>
2 months ago
self.assertTrue(get('tools/metrics/actions/abc.xml'))
self.assertTrue(get('tools/metrics/histograms/abc.xml'))
self.assertTrue(get('tools/metrics/structured/abc.xml'))
self.assertTrue(get('tools/metrics/ukm/abc.xml'))
self.assertFalse(get('tools/test/metrics/actions/abc.xml'))
self.assertFalse(get('tools/test/metrics/histograms/abc.xml'))
self.assertFalse(get('tools/test/metrics/structured/abc.xml'))
self.assertFalse(get('tools/test/metrics/ukm/abc.xml'))
def testWithRelativePaths(self):
Reland "Support formatting metrics xml(s) in the subfolders." This reverts commit bfe1a9282dd124d0748145995602880b0dbf92b5. Reason for revert: reland with a fix. - Find the diff between ps#1 and ps#2. - Tested at https://paste.googleplex.com/4670451708854272 Original change's description: > Revert "Support formatting metrics xml(s) in the subfolders." > > This reverts commit 597ba08be5eb953914ba48d2dc85f1f41dbbec31. > > Reason for revert: it broke git_cl.py. Need further patch > > Original change's description: > > Support formatting metrics xml(s) in the subfolders. > > > > https://crrev.com/c/6072565 assumed that the XMLs are located under > > tools/metrics/{actions,ukm,structured,histograms} directly, such as > > tools/metrics/histograms/enums.xml. > > > > However, its subfolders may have XML files, and it should format > > the files. This CL fixes it. > > > > Bug: 384940858 > > Change-Id: I56484144e6f72f41eb5bc37a5ad462a0de1ec0e3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111994 > > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> > > Auto-Submit: Scott Lee <ddoman@chromium.org> > > Commit-Queue: Scott Lee <ddoman@chromium.org> > > Bug: 384940858 > Change-Id: I322573ad6d2d758cd3d2de872efdbba4fd9330c2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111996 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Scott Lee <ddoman@chromium.org> Bug: 384940858 Change-Id: Ibe20d5e46c519d7fdbd1114565ec3856e5bf928e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111997 Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Scott Lee <ddoman@chromium.org>
2 months ago
top = self.getcwd()
# chdir() to tools so that relative paths from tools become valid.
self.cwd = os.path.join(self.cwd, 'tools')
get = lambda path: metrics_xml_format.GetMetricsDir(top, path)
self.assertTrue(get(norm('metrics/actions/abc.xml')))
self.assertFalse(get(norm('abc.xml')))
class FindMetricsXMLFormatTool(TestBase):
def testWithMetricsXML(self):
Reland "Support formatting metrics xml(s) in the subfolders." This reverts commit bfe1a9282dd124d0748145995602880b0dbf92b5. Reason for revert: reland with a fix. - Find the diff between ps#1 and ps#2. - Tested at https://paste.googleplex.com/4670451708854272 Original change's description: > Revert "Support formatting metrics xml(s) in the subfolders." > > This reverts commit 597ba08be5eb953914ba48d2dc85f1f41dbbec31. > > Reason for revert: it broke git_cl.py. Need further patch > > Original change's description: > > Support formatting metrics xml(s) in the subfolders. > > > > https://crrev.com/c/6072565 assumed that the XMLs are located under > > tools/metrics/{actions,ukm,structured,histograms} directly, such as > > tools/metrics/histograms/enums.xml. > > > > However, its subfolders may have XML files, and it should format > > the files. This CL fixes it. > > > > Bug: 384940858 > > Change-Id: I56484144e6f72f41eb5bc37a5ad462a0de1ec0e3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111994 > > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> > > Auto-Submit: Scott Lee <ddoman@chromium.org> > > Commit-Queue: Scott Lee <ddoman@chromium.org> > > Bug: 384940858 > Change-Id: I322573ad6d2d758cd3d2de872efdbba4fd9330c2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111996 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Scott Lee <ddoman@chromium.org> Bug: 384940858 Change-Id: Ibe20d5e46c519d7fdbd1114565ec3856e5bf928e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111997 Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Scott Lee <ddoman@chromium.org>
2 months ago
top = self.getcwd()
findTool = metrics_xml_format.FindMetricsXMLFormatterTool
self.assertEqual(
findTool(norm('tools/metrics/actions/abc.xml')),
Reland "Support formatting metrics xml(s) in the subfolders." This reverts commit bfe1a9282dd124d0748145995602880b0dbf92b5. Reason for revert: reland with a fix. - Find the diff between ps#1 and ps#2. - Tested at https://paste.googleplex.com/4670451708854272 Original change's description: > Revert "Support formatting metrics xml(s) in the subfolders." > > This reverts commit 597ba08be5eb953914ba48d2dc85f1f41dbbec31. > > Reason for revert: it broke git_cl.py. Need further patch > > Original change's description: > > Support formatting metrics xml(s) in the subfolders. > > > > https://crrev.com/c/6072565 assumed that the XMLs are located under > > tools/metrics/{actions,ukm,structured,histograms} directly, such as > > tools/metrics/histograms/enums.xml. > > > > However, its subfolders may have XML files, and it should format > > the files. This CL fixes it. > > > > Bug: 384940858 > > Change-Id: I56484144e6f72f41eb5bc37a5ad462a0de1ec0e3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111994 > > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> > > Auto-Submit: Scott Lee <ddoman@chromium.org> > > Commit-Queue: Scott Lee <ddoman@chromium.org> > > Bug: 384940858 > Change-Id: I322573ad6d2d758cd3d2de872efdbba4fd9330c2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111996 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Scott Lee <ddoman@chromium.org> Bug: 384940858 Change-Id: Ibe20d5e46c519d7fdbd1114565ec3856e5bf928e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111997 Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Scott Lee <ddoman@chromium.org>
2 months ago
os.path.join(top, norm('tools/metrics/actions/pretty_print.py')),
)
# same test, but with an absolute path.
self.assertEqual(
Reland "Support formatting metrics xml(s) in the subfolders." This reverts commit bfe1a9282dd124d0748145995602880b0dbf92b5. Reason for revert: reland with a fix. - Find the diff between ps#1 and ps#2. - Tested at https://paste.googleplex.com/4670451708854272 Original change's description: > Revert "Support formatting metrics xml(s) in the subfolders." > > This reverts commit 597ba08be5eb953914ba48d2dc85f1f41dbbec31. > > Reason for revert: it broke git_cl.py. Need further patch > > Original change's description: > > Support formatting metrics xml(s) in the subfolders. > > > > https://crrev.com/c/6072565 assumed that the XMLs are located under > > tools/metrics/{actions,ukm,structured,histograms} directly, such as > > tools/metrics/histograms/enums.xml. > > > > However, its subfolders may have XML files, and it should format > > the files. This CL fixes it. > > > > Bug: 384940858 > > Change-Id: I56484144e6f72f41eb5bc37a5ad462a0de1ec0e3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111994 > > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> > > Auto-Submit: Scott Lee <ddoman@chromium.org> > > Commit-Queue: Scott Lee <ddoman@chromium.org> > > Bug: 384940858 > Change-Id: I322573ad6d2d758cd3d2de872efdbba4fd9330c2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111996 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Scott Lee <ddoman@chromium.org> Bug: 384940858 Change-Id: Ibe20d5e46c519d7fdbd1114565ec3856e5bf928e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111997 Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Scott Lee <ddoman@chromium.org>
2 months ago
findTool(os.path.join(top, norm('tools/metrics/actions/abc.xml'))),
os.path.join(top, norm('tools/metrics/actions/pretty_print.py')),
)
def testWthNonMetricsXML(self):
findTool = metrics_xml_format.FindMetricsXMLFormatterTool
Reland "Support formatting metrics xml(s) in the subfolders." This reverts commit bfe1a9282dd124d0748145995602880b0dbf92b5. Reason for revert: reland with a fix. - Find the diff between ps#1 and ps#2. - Tested at https://paste.googleplex.com/4670451708854272 Original change's description: > Revert "Support formatting metrics xml(s) in the subfolders." > > This reverts commit 597ba08be5eb953914ba48d2dc85f1f41dbbec31. > > Reason for revert: it broke git_cl.py. Need further patch > > Original change's description: > > Support formatting metrics xml(s) in the subfolders. > > > > https://crrev.com/c/6072565 assumed that the XMLs are located under > > tools/metrics/{actions,ukm,structured,histograms} directly, such as > > tools/metrics/histograms/enums.xml. > > > > However, its subfolders may have XML files, and it should format > > the files. This CL fixes it. > > > > Bug: 384940858 > > Change-Id: I56484144e6f72f41eb5bc37a5ad462a0de1ec0e3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111994 > > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> > > Auto-Submit: Scott Lee <ddoman@chromium.org> > > Commit-Queue: Scott Lee <ddoman@chromium.org> > > Bug: 384940858 > Change-Id: I322573ad6d2d758cd3d2de872efdbba4fd9330c2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111996 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Scott Lee <ddoman@chromium.org> Bug: 384940858 Change-Id: Ibe20d5e46c519d7fdbd1114565ec3856e5bf928e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111997 Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Scott Lee <ddoman@chromium.org>
2 months ago
self.assertEqual(findTool(norm('tools/metrics/test/abc.xml')), '')
def testWithNonCheckout(self):
findTool = metrics_xml_format.FindMetricsXMLFormatterTool
self.cwd = self.root
Reland "Support formatting metrics xml(s) in the subfolders." This reverts commit bfe1a9282dd124d0748145995602880b0dbf92b5. Reason for revert: reland with a fix. - Find the diff between ps#1 and ps#2. - Tested at https://paste.googleplex.com/4670451708854272 Original change's description: > Revert "Support formatting metrics xml(s) in the subfolders." > > This reverts commit 597ba08be5eb953914ba48d2dc85f1f41dbbec31. > > Reason for revert: it broke git_cl.py. Need further patch > > Original change's description: > > Support formatting metrics xml(s) in the subfolders. > > > > https://crrev.com/c/6072565 assumed that the XMLs are located under > > tools/metrics/{actions,ukm,structured,histograms} directly, such as > > tools/metrics/histograms/enums.xml. > > > > However, its subfolders may have XML files, and it should format > > the files. This CL fixes it. > > > > Bug: 384940858 > > Change-Id: I56484144e6f72f41eb5bc37a5ad462a0de1ec0e3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111994 > > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> > > Auto-Submit: Scott Lee <ddoman@chromium.org> > > Commit-Queue: Scott Lee <ddoman@chromium.org> > > Bug: 384940858 > Change-Id: I322573ad6d2d758cd3d2de872efdbba4fd9330c2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111996 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Scott Lee <ddoman@chromium.org> Bug: 384940858 Change-Id: Ibe20d5e46c519d7fdbd1114565ec3856e5bf928e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111997 Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Scott Lee <ddoman@chromium.org>
2 months ago
self.assertEqual(findTool(norm('tools/metrics/actions/abc.xml')), '')
def testWithDifferentCheckout(self):
findTool = metrics_xml_format.FindMetricsXMLFormatterTool
Reland "Support formatting metrics xml(s) in the subfolders." This reverts commit bfe1a9282dd124d0748145995602880b0dbf92b5. Reason for revert: reland with a fix. - Find the diff between ps#1 and ps#2. - Tested at https://paste.googleplex.com/4670451708854272 Original change's description: > Revert "Support formatting metrics xml(s) in the subfolders." > > This reverts commit 597ba08be5eb953914ba48d2dc85f1f41dbbec31. > > Reason for revert: it broke git_cl.py. Need further patch > > Original change's description: > > Support formatting metrics xml(s) in the subfolders. > > > > https://crrev.com/c/6072565 assumed that the XMLs are located under > > tools/metrics/{actions,ukm,structured,histograms} directly, such as > > tools/metrics/histograms/enums.xml. > > > > However, its subfolders may have XML files, and it should format > > the files. This CL fixes it. > > > > Bug: 384940858 > > Change-Id: I56484144e6f72f41eb5bc37a5ad462a0de1ec0e3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111994 > > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> > > Auto-Submit: Scott Lee <ddoman@chromium.org> > > Commit-Queue: Scott Lee <ddoman@chromium.org> > > Bug: 384940858 > Change-Id: I322573ad6d2d758cd3d2de872efdbba4fd9330c2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111996 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Scott Lee <ddoman@chromium.org> Bug: 384940858 Change-Id: Ibe20d5e46c519d7fdbd1114565ec3856e5bf928e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111997 Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Scott Lee <ddoman@chromium.org>
2 months ago
checkout2 = os.path.join(self.root, '..', self._testMethodName + '2',
'src')
self.assertEqual(
# this is the case the tool was given a file path that is located
# in a different checkout folder.
Reland "Support formatting metrics xml(s) in the subfolders." This reverts commit bfe1a9282dd124d0748145995602880b0dbf92b5. Reason for revert: reland with a fix. - Find the diff between ps#1 and ps#2. - Tested at https://paste.googleplex.com/4670451708854272 Original change's description: > Revert "Support formatting metrics xml(s) in the subfolders." > > This reverts commit 597ba08be5eb953914ba48d2dc85f1f41dbbec31. > > Reason for revert: it broke git_cl.py. Need further patch > > Original change's description: > > Support formatting metrics xml(s) in the subfolders. > > > > https://crrev.com/c/6072565 assumed that the XMLs are located under > > tools/metrics/{actions,ukm,structured,histograms} directly, such as > > tools/metrics/histograms/enums.xml. > > > > However, its subfolders may have XML files, and it should format > > the files. This CL fixes it. > > > > Bug: 384940858 > > Change-Id: I56484144e6f72f41eb5bc37a5ad462a0de1ec0e3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111994 > > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> > > Auto-Submit: Scott Lee <ddoman@chromium.org> > > Commit-Queue: Scott Lee <ddoman@chromium.org> > > Bug: 384940858 > Change-Id: I322573ad6d2d758cd3d2de872efdbba4fd9330c2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111996 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Scott Lee <ddoman@chromium.org> Bug: 384940858 Change-Id: Ibe20d5e46c519d7fdbd1114565ec3856e5bf928e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111997 Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Scott Lee <ddoman@chromium.org>
2 months ago
findTool(
os.path.join(checkout2, norm('tools/metrics/actions/abc.xml'))),
'',
)
def testSupportedHistogramsXML(self):
Reland "Support formatting metrics xml(s) in the subfolders." This reverts commit bfe1a9282dd124d0748145995602880b0dbf92b5. Reason for revert: reland with a fix. - Find the diff between ps#1 and ps#2. - Tested at https://paste.googleplex.com/4670451708854272 Original change's description: > Revert "Support formatting metrics xml(s) in the subfolders." > > This reverts commit 597ba08be5eb953914ba48d2dc85f1f41dbbec31. > > Reason for revert: it broke git_cl.py. Need further patch > > Original change's description: > > Support formatting metrics xml(s) in the subfolders. > > > > https://crrev.com/c/6072565 assumed that the XMLs are located under > > tools/metrics/{actions,ukm,structured,histograms} directly, such as > > tools/metrics/histograms/enums.xml. > > > > However, its subfolders may have XML files, and it should format > > the files. This CL fixes it. > > > > Bug: 384940858 > > Change-Id: I56484144e6f72f41eb5bc37a5ad462a0de1ec0e3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111994 > > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> > > Auto-Submit: Scott Lee <ddoman@chromium.org> > > Commit-Queue: Scott Lee <ddoman@chromium.org> > > Bug: 384940858 > Change-Id: I322573ad6d2d758cd3d2de872efdbba4fd9330c2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111996 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Scott Lee <ddoman@chromium.org> Bug: 384940858 Change-Id: Ibe20d5e46c519d7fdbd1114565ec3856e5bf928e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111997 Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Scott Lee <ddoman@chromium.org>
2 months ago
top = self.getcwd()
findTool = metrics_xml_format.FindMetricsXMLFormatterTool
self.assertEqual(
findTool(norm('tools/metrics/histograms/enums.xml')),
Reland "Support formatting metrics xml(s) in the subfolders." This reverts commit bfe1a9282dd124d0748145995602880b0dbf92b5. Reason for revert: reland with a fix. - Find the diff between ps#1 and ps#2. - Tested at https://paste.googleplex.com/4670451708854272 Original change's description: > Revert "Support formatting metrics xml(s) in the subfolders." > > This reverts commit 597ba08be5eb953914ba48d2dc85f1f41dbbec31. > > Reason for revert: it broke git_cl.py. Need further patch > > Original change's description: > > Support formatting metrics xml(s) in the subfolders. > > > > https://crrev.com/c/6072565 assumed that the XMLs are located under > > tools/metrics/{actions,ukm,structured,histograms} directly, such as > > tools/metrics/histograms/enums.xml. > > > > However, its subfolders may have XML files, and it should format > > the files. This CL fixes it. > > > > Bug: 384940858 > > Change-Id: I56484144e6f72f41eb5bc37a5ad462a0de1ec0e3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111994 > > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> > > Auto-Submit: Scott Lee <ddoman@chromium.org> > > Commit-Queue: Scott Lee <ddoman@chromium.org> > > Bug: 384940858 > Change-Id: I322573ad6d2d758cd3d2de872efdbba4fd9330c2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111996 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Scott Lee <ddoman@chromium.org> Bug: 384940858 Change-Id: Ibe20d5e46c519d7fdbd1114565ec3856e5bf928e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111997 Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Scott Lee <ddoman@chromium.org>
2 months ago
os.path.join(top, norm('tools/metrics/histograms/pretty_print.py')),
)
self.assertEqual(
findTool(norm('tools/metrics/histograms/tests/histograms.xml')),
os.path.join(top, norm('tools/metrics/histograms/pretty_print.py')),
)
def testNotSupportedHistogramsXML(self):
Reland "Support formatting metrics xml(s) in the subfolders." This reverts commit bfe1a9282dd124d0748145995602880b0dbf92b5. Reason for revert: reland with a fix. - Find the diff between ps#1 and ps#2. - Tested at https://paste.googleplex.com/4670451708854272 Original change's description: > Revert "Support formatting metrics xml(s) in the subfolders." > > This reverts commit 597ba08be5eb953914ba48d2dc85f1f41dbbec31. > > Reason for revert: it broke git_cl.py. Need further patch > > Original change's description: > > Support formatting metrics xml(s) in the subfolders. > > > > https://crrev.com/c/6072565 assumed that the XMLs are located under > > tools/metrics/{actions,ukm,structured,histograms} directly, such as > > tools/metrics/histograms/enums.xml. > > > > However, its subfolders may have XML files, and it should format > > the files. This CL fixes it. > > > > Bug: 384940858 > > Change-Id: I56484144e6f72f41eb5bc37a5ad462a0de1ec0e3 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111994 > > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> > > Auto-Submit: Scott Lee <ddoman@chromium.org> > > Commit-Queue: Scott Lee <ddoman@chromium.org> > > Bug: 384940858 > Change-Id: I322573ad6d2d758cd3d2de872efdbba4fd9330c2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111996 > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Scott Lee <ddoman@chromium.org> Bug: 384940858 Change-Id: Ibe20d5e46c519d7fdbd1114565ec3856e5bf928e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6111997 Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> Commit-Queue: Scott Lee <ddoman@chromium.org>
2 months ago
tool = metrics_xml_format.FindMetricsXMLFormatterTool(
norm('tools/metrics/histograms/NO.xml'))
self.assertEqual(tool, '')
if __name__ == '__main__':
unittest.main()