aboutsummaryrefslogtreecommitdiff
path: root/catapult/devil/devil/utils/cmd_helper_test.py
diff options
context:
space:
mode:
authorHridya Valsaraju <hridya@google.com>2021-04-15 15:57:00 -0700
committerHridya Valsaraju <hridya@google.com>2021-04-15 15:57:00 -0700
commit4537bffda5f89155f2f27afc7c80e4c0354c1c20 (patch)
treeb9a6b60023b853553ae095370bf251a2f1f7640e /catapult/devil/devil/utils/cmd_helper_test.py
parent25821f7b195e31b5b957ddc720a6bc12700362a0 (diff)
downloadchromium-trace-4537bffda5f89155f2f27afc7c80e4c0354c1c20.tar.gz
Update catapult to latest version(ab9d330fe2)
git log --oneline --no-merges 91735e2e6..ab9d330fe2a3 tracing systrace ab9d330fe systrace: check if tracefs in mounted in /sys/kernel/tracing 361ae742a systrace: fix tracefs device path detection 22a35ea6a [tracing] Avoid very large vulcanized strings in histogram_viewer.html 494a8eb59 [tracing] Add blink-resource metric a297a0839 Reland "Remove memoryAblationMetric" b0fb5822d Used undefined bins as bins of count zero d229e77e8 Check the bins to be defined before using them in UMA metrics calculations de74236cf PCScan: Add :clear and :overall metrics for mutator e46359da4 Move metadata in OWNERS files to DIR_METADATA files 999f35f30 Revert "Remove memoryAblationMetric" 7caeed04d Remove memoryAblationMetric b965b659c Added metrics for percentage of inTime/delayed/dropped frames e5299ca5b Fix crash while processing memory dumps 4f4de5e16 PCScan: Update metric to reflect scope contexts 2528f75cb Fix drill down in heap dump pane 1f5037810 trace-viewer: Don't let optional features block import d2aa56920 Reland "Enable the new GC metrics"" e6e7c9314 Revert "Enable the new GC metrics" 9e0992ffc Enable the new GC metrics 79a90eb5e Include missing header 138dc4ba2 Calculate Overall CLS including all renderer processes. c8f9f36bb Add a generic count/sum metric. 73a0597ed Add overallCumulativeLayoutShift metric that includes weighted scores for iframes. Test: systrace Bug: 185400108 Change-Id: I195c394b78094c4385b308ab6abf1cf57009569b
Diffstat (limited to 'catapult/devil/devil/utils/cmd_helper_test.py')
-rwxr-xr-xcatapult/devil/devil/utils/cmd_helper_test.py25
1 files changed, 22 insertions, 3 deletions
diff --git a/catapult/devil/devil/utils/cmd_helper_test.py b/catapult/devil/devil/utils/cmd_helper_test.py
index 57abceb4..0eeefe16 100755
--- a/catapult/devil/devil/utils/cmd_helper_test.py
+++ b/catapult/devil/devil/utils/cmd_helper_test.py
@@ -33,6 +33,17 @@ class CmdHelperSingleQuoteTest(unittest.TestCase):
self.assertEquals(test_string,
cmd_helper.GetCmdOutput(cmd, shell=True).rstrip())
+class CmdHelperGetCmdStatusAndOutputTest(unittest.TestCase):
+ def testGetCmdStatusAndOutput_success(self):
+ cmd = 'echo "Hello World"'
+ status, output = cmd_helper.GetCmdStatusAndOutput(cmd, shell=True)
+ self.assertEqual(status, 0)
+ self.assertEqual(output.rstrip(), "Hello World")
+
+ def testGetCmdStatusAndOutput_unicode(self):
+ # pylint: disable=no-self-use
+ cmd = 'echo "\x80\x31Hello World\n"'
+ cmd_helper.GetCmdStatusAndOutput(cmd, shell=True)
class CmdHelperDoubleQuoteTest(unittest.TestCase):
def testDoubleQuote_basic(self):
@@ -195,7 +206,7 @@ class CmdHelperIterCmdOutputLinesTest(unittest.TestCase):
# pylint: disable=protected-access
_SIMPLE_OUTPUT_SEQUENCE = [
- _ProcessOutputEvent(read_contents='1\n2\n'),
+ _ProcessOutputEvent(read_contents=b'1\n2\n'),
]
def testIterCmdOutputLines_success(self):
@@ -205,6 +216,14 @@ class CmdHelperIterCmdOutputLinesTest(unittest.TestCase):
cmd_helper._IterCmdOutputLines(mock_proc, 'mock_proc'), 1):
self.assertEquals(num, int(line))
+ def testIterCmdOutputLines_unicode(self):
+ output_sequence = [
+ _ProcessOutputEvent(read_contents=b'\x80\x31\nHello\n\xE2\x98\xA0')
+ ]
+ with _MockProcess(output_sequence=output_sequence) as mock_proc:
+ lines = list(cmd_helper._IterCmdOutputLines(mock_proc, 'mock_proc'))
+ self.assertEquals(lines[1], "Hello")
+
def testIterCmdOutputLines_exitStatusFail(self):
with self.assertRaises(subprocess.CalledProcessError):
with _MockProcess(
@@ -238,9 +257,9 @@ class CmdHelperIterCmdOutputLinesTest(unittest.TestCase):
def testIterCmdOutputLines_delay(self):
output_sequence = [
- _ProcessOutputEvent(read_contents='1\n2\n', ts=1),
+ _ProcessOutputEvent(read_contents=b'1\n2\n', ts=1),
_ProcessOutputEvent(read_contents=None, ts=2),
- _ProcessOutputEvent(read_contents='Awake', ts=10),
+ _ProcessOutputEvent(read_contents=b'Awake', ts=10),
]
with _MockProcess(output_sequence=output_sequence) as mock_proc:
for num, line in enumerate(