From 1eeefa63b9ad8289138b83dfccda3ff38ed23fb6 Mon Sep 17 00:00:00 2001 From: Alex Light Date: Mon, 19 Mar 2018 13:47:56 -0700 Subject: Remove unhelpful ExceptionDescribe from DDMS error path. If a DDMS handler threw an error or returned invalid input we would call ExceptionDescribe on the exception. This is usually not very helpful since it goes to System.err instead of logcat and can make testing difficult. This change replaces the ExceptionDescribe with a LOG(INFO). Test: ./test.py --host -j50 Bug: 70988713 Change-Id: I41e743c42e63c0dcb6d32473c31f391983819d32 --- test/1940-ddms-ext/remove_error.py | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100755 test/1940-ddms-ext/remove_error.py (limited to 'test/1940-ddms-ext/remove_error.py') diff --git a/test/1940-ddms-ext/remove_error.py b/test/1940-ddms-ext/remove_error.py deleted file mode 100755 index 638c479a31..0000000000 --- a/test/1940-ddms-ext/remove_error.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python3 -# -# Copyright (C) 2018 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import argparse - -def main(): - parser = argparse.ArgumentParser() - parser.add_argument('input_data', type=open) - parser.add_argument('expected_error', type=str) - args = parser.parse_args() - - for line in map(str.rstrip, args.input_data.readlines()): - print_full = True - with open(args.expected_error) as err_file: - for err_line in map(str.rstrip, err_file): - if line.startswith(err_line): - print_full = False - if line != err_line: - print(line[len(err_line):]) - break - if print_full and line != '': - print(line) - -if __name__ == '__main__': - main() -- cgit v1.2.3-59-g8ed1b