From 118aa2368b37e97c76674dbc344e64f7d3f8b7e9 Mon Sep 17 00:00:00 2001 From: Yue Zhang Date: Wed, 13 May 2020 00:29:08 +0000 Subject: [PATCH] Bug 1630610 - Fix broken code. r=sparky Differential Revision: https://phabricator.services.mozilla.com/D73154 --- .../mozperftest/metrics/notebook/perftestnotebook.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/python/mozperftest/mozperftest/metrics/notebook/perftestnotebook.py b/python/mozperftest/mozperftest/metrics/notebook/perftestnotebook.py index 1614429ecdbc..f19ab2f1729f 100644 --- a/python/mozperftest/mozperftest/metrics/notebook/perftestnotebook.py +++ b/python/mozperftest/mozperftest/metrics/notebook/perftestnotebook.py @@ -75,20 +75,13 @@ class PerftestNotebook(object): elif isinstance(file_grouping, dict): # A dictionary of settings from an artifact_downloader instance # was provided here - print("awljdlkwad") raise Exception( "Artifact downloader tooling is disabled for the time being." ) elif isinstance(file_grouping, str): # Assume a path to files was given - filepath = files - - newf = [f for f in pathlib.Path(filepath).rglob("*.json")] - if not newf: - # Couldn't find any JSON files, so take all the files - # in the directory - newf = [f for f in pathlib.Path(filepath).rglob("*")] - + filepath = file_grouping + newf = [f.resolve().as_posix() for f in pathlib.Path(filepath).rglob("*")] files = newf else: raise Exception(