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

Side by Side Diff: client/tests/trace_inputs_test.py

Issue 2093593002: luci-py: Making __file__ usage unicode safe. (Closed) Base URL: https://github.com/luci/luci-py.git@master
Patch Set: Small fixes. Created 4 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 unified diff | Download patch
« no previous file with comments | « client/tests/trace_inputs_smoke_test.py ('k') | client/tests/url_open_timeout_test.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # coding=utf-8 2 # coding=utf-8
3 # Copyright 2012 The LUCI Authors. All rights reserved. 3 # Copyright 2012 The LUCI Authors. All rights reserved.
4 # Use of this source code is governed under the Apache License, Version 2.0 4 # Use of this source code is governed under the Apache License, Version 2.0
5 # that can be found in the LICENSE file. 5 # that can be found in the LICENSE file.
6 6
7 import StringIO 7 import StringIO
8 import logging 8 import logging
9 import os 9 import os
10 import sys 10 import sys
11 import unittest 11 import unittest
12 12
13 BASE_DIR = unicode(os.path.dirname(os.path.abspath(__file__))) 13 BASE_DIR = os.path.dirname(os.path.abspath(
14 __file__.decode(sys.getfilesystemencoding())))
14 ROOT_DIR = os.path.dirname(BASE_DIR) 15 ROOT_DIR = os.path.dirname(BASE_DIR)
15 sys.path.insert(0, ROOT_DIR) 16 sys.path.insert(0, ROOT_DIR)
16 17
17 FILE_PATH = unicode(os.path.abspath(__file__)) 18 FILE_PATH = os.path.abspath(__file__.decode(sys.getfilesystemencoding()))
18 19
19 import trace_inputs 20 import trace_inputs
20 21
21 # Access to a protected member _FOO of a client class 22 # Access to a protected member _FOO of a client class
22 # pylint: disable=W0212 23 # pylint: disable=W0212
23 24
24 25
25 def join_norm(*args): 26 def join_norm(*args):
26 """Joins and normalizes path in a single step.""" 27 """Joins and normalizes path in a single step."""
27 return unicode(os.path.normpath(os.path.join(*args))) 28 return unicode(os.path.normpath(os.path.join(*args)))
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 lines = [ 231 lines = [
231 (self._ROOT_PID, 232 (self._ROOT_PID,
232 'clone(child_stack=0, flags=CLONE_CHILD_CLEARTID' 233 'clone(child_stack=0, flags=CLONE_CHILD_CLEARTID'
233 '|CLONE_CHILD_SETTID|SIGCHLD, child_tidptr=0x7f5350f829d0) = %d' % 234 '|CLONE_CHILD_SETTID|SIGCHLD, child_tidptr=0x7f5350f829d0) = %d' %
234 self._CHILD_PID), 235 self._CHILD_PID),
235 (self._CHILD_PID, 236 (self._CHILD_PID,
236 'clone(child_stack=0, flags=CLONE_CHILD_CLEARTID' 237 'clone(child_stack=0, flags=CLONE_CHILD_CLEARTID'
237 '|CLONE_CHILD_SETTID|SIGCHLD, child_tidptr=0x7f5350f829d0) = %d' % 238 '|CLONE_CHILD_SETTID|SIGCHLD, child_tidptr=0x7f5350f829d0) = %d' %
238 self._GRAND_CHILD_PID), 239 self._GRAND_CHILD_PID),
239 (self._GRAND_CHILD_PID, 240 (self._GRAND_CHILD_PID,
240 'open("%s", O_RDONLY) = 76' % os.path.basename(str(FILE_PATH))), 241 'open("%s", O_RDONLY) = 76' % os.path.basename(
242 FILE_PATH.encode('utf-8'))),
241 ] 243 ]
242 size = os.stat(FILE_PATH).st_size 244 size = os.stat(FILE_PATH).st_size
243 expected = { 245 expected = {
244 'root': { 246 'root': {
245 'children': [ 247 'children': [
246 { 248 {
247 'children': [ 249 'children': [
248 { 250 {
249 'children': [], 251 'children': [],
250 'command': None, 252 'command': None,
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 } 681 }
680 self.assertContext(lines, ROOT_DIR, expected, False) 682 self.assertContext(lines, ROOT_DIR, expected, False)
681 683
682 684
683 if __name__ == '__main__': 685 if __name__ == '__main__':
684 logging.basicConfig( 686 logging.basicConfig(
685 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR) 687 level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
686 if '-v' in sys.argv: 688 if '-v' in sys.argv:
687 unittest.TestCase.maxDiff = None 689 unittest.TestCase.maxDiff = None
688 unittest.main() 690 unittest.main()
OLDNEW
« no previous file with comments | « client/tests/trace_inputs_smoke_test.py ('k') | client/tests/url_open_timeout_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698