diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-16 17:05:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-16 17:05:22 +0000 |
| commit | d5085cc096b959470581e35284bcc1d6d58e4cdd (patch) | |
| tree | b9a6b60023b853553ae095370bf251a2f1f7640e /catapult/devil/devil/android/tools/device_monitor_test.py | |
| parent | a534c20c58270224b17ad1f53245fada78637c22 (diff) | |
| parent | b101eec5e1fa0a0d1903f5c151afc4d0850c6e7a (diff) | |
| download | chromium-trace-d5085cc096b959470581e35284bcc1d6d58e4cdd.tar.gz | |
Merge changes I195c394b,Iff693cf6 am: b101eec5e1
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1677030
Change-Id: I2a88f858acd6762b9d0b162abd419f62dccbee36
Diffstat (limited to 'catapult/devil/devil/android/tools/device_monitor_test.py')
| -rwxr-xr-x | catapult/devil/devil/android/tools/device_monitor_test.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/catapult/devil/devil/android/tools/device_monitor_test.py b/catapult/devil/devil/android/tools/device_monitor_test.py index 8082d26e..1bb5680a 100755 --- a/catapult/devil/devil/android/tools/device_monitor_test.py +++ b/catapult/devil/devil/android/tools/device_monitor_test.py @@ -7,6 +7,8 @@ import os import sys import unittest +import six + if __name__ == '__main__': sys.path.append( os.path.abspath( @@ -53,7 +55,7 @@ class DeviceMonitorTest(unittest.TestCase): } def mock_run_shell(cmd, **_kwargs): - args = cmd.split() if isinstance(cmd, basestring) else cmd + args = cmd.split() if isinstance(cmd, six.string_types) else cmd try: return self.cmd_outputs[args[0]] except KeyError: |