From a29f589a15b7f80edd3d0bbe4f3a2dbb1120316c Mon Sep 17 00:00:00 2001 From: Josip Sokcevic Date: Mon, 22 Nov 2021 23:32:29 +0000 Subject: [PATCH] Make fix_encoding_test py3 compatible And run it in presubmit checks R=gavinmak@google.com Change-Id: If2a8848f6ce85c466f45d9bf0f4fca6b4d75312f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3296677 Reviewed-by: Gavin Mak Commit-Queue: Josip Sokcevic --- PRESUBMIT.py | 1 - tests/fix_encoding_test.py | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 51f65488a..58ef96cd2 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -109,7 +109,6 @@ def CheckUnitTestsOnCommit(input_api, output_api): r'.*recipes_test\.py$', ]) py2_only_tests = [ - 'fix_encoding_test.py', 'recipes_test.py', ] diff --git a/tests/fix_encoding_test.py b/tests/fix_encoding_test.py index e443f5848..0d04c223f 100755 --- a/tests/fix_encoding_test.py +++ b/tests/fix_encoding_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # coding=utf-8 # Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be @@ -23,8 +23,8 @@ class FixEncodingTest(unittest.TestCase): def test_code_page(self): # Make sure printing garbage won't throw. - print(self.text.encode() + '\xff') - print(self.text.encode() + '\xff', file=sys.stderr) + print(self.text.encode() + b'\xff') + print(self.text.encode() + b'\xff', file=sys.stderr) def test_utf8(self): # Make sure printing utf-8 works. @@ -58,5 +58,5 @@ class FixEncodingTest(unittest.TestCase): if __name__ == '__main__': - assert fix_encoding.fix_encoding() + fix_encoding.fix_encoding() unittest.main()