Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(405)

Unified Diff: trunk/src/tools/android/adb_profile_chrome/trace_packager_unittest.py

Issue 330713002: Revert 276779 "Move adb_profile_chrome under tools/android/" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/tools/android/adb_profile_chrome/trace_packager_unittest.py
===================================================================
--- trunk/src/tools/android/adb_profile_chrome/trace_packager_unittest.py (revision 276783)
+++ trunk/src/tools/android/adb_profile_chrome/trace_packager_unittest.py (working copy)
@@ -1,35 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-from adb_profile_chrome import trace_packager
-
-import json
-import tempfile
-import unittest
-
-
-class TracePackagerTest(unittest.TestCase):
- def testJsonTraceMerging(self):
- t1 = {'traceEvents': [{'ts': 123, 'ph': 'b'}]}
- t2 = {'traceEvents': [], 'stackFrames': ['blah']}
-
- # Both trace files will be merged to a third file and will get deleted in
- # the process, so there's no need for NamedTemporaryFile to do the
- # deletion.
- with tempfile.NamedTemporaryFile(delete=False) as f1, \
- tempfile.NamedTemporaryFile(delete=False) as f2:
- f1.write(json.dumps(t1))
- f2.write(json.dumps(t2))
- f1.flush()
- f2.flush()
-
- with tempfile.NamedTemporaryFile() as output:
- trace_packager.PackageTraces([f1.name, f2.name],
- output.name,
- compress=False,
- write_json=True)
- with open(output.name) as output:
- output = json.load(output)
- self.assertEquals(output['traceEvents'], t1['traceEvents'])
- self.assertEquals(output['stackFrames'], t2['stackFrames'])
« no previous file with comments | « trunk/src/tools/android/adb_profile_chrome/trace_packager.py ('k') | trunk/src/tools/android/adb_profile_chrome/ui.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698