From c229a51c7050971a876addb6962f3ee7d35de74a Mon Sep 17 00:00:00 2001 From: Bob Clary Date: Thu, 31 Jan 2019 20:35:56 -0800 Subject: [PATCH] Bug 1524150 - [mozdevice] remove -s from ADBProcess-based error messages, r=gbrown. --- testing/mozbase/mozdevice/mozdevice/adb.py | 6 +++++- testing/mozbase/mozdevice/setup.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/testing/mozbase/mozdevice/mozdevice/adb.py b/testing/mozbase/mozdevice/mozdevice/adb.py index f8c7491e6e72..94a9a4b48c70 100644 --- a/testing/mozbase/mozdevice/mozdevice/adb.py +++ b/testing/mozbase/mozdevice/mozdevice/adb.py @@ -46,8 +46,12 @@ class ADBProcess(object): return content def __str__(self): + # Remove -s from the error message to allow bug suggestions + # to be independent of the individual failing device. + arg_string = ' '.join(self.args) + arg_string = re.sub(' -s \w+', '', arg_string) return ('args: %s, exitcode: %s, stdout: %s' % ( - ' '.join(self.args), self.exitcode, self.stdout)) + arg_string, self.exitcode, self.stdout)) # ADBError, ADBRootError, and ADBTimeoutError are treated # differently in order that unhandled ADBRootErrors and diff --git a/testing/mozbase/mozdevice/setup.py b/testing/mozbase/mozdevice/setup.py index 78fc74177323..acd9c5a68d7d 100644 --- a/testing/mozbase/mozdevice/setup.py +++ b/testing/mozbase/mozdevice/setup.py @@ -8,7 +8,7 @@ from __future__ import absolute_import from setuptools import setup PACKAGE_NAME = 'mozdevice' -PACKAGE_VERSION = '2.0' +PACKAGE_VERSION = '2.0.1' deps = ['mozlog >= 3.0']