Fix path separators in PRESUBMIT tests on Windows
Bug: 914928
Change-Id: I4215c91ff83d04634b7bf19f6d8cfd0fe3c3e618
Reviewed-on: https://chromium-review.googlesource.com/c/1381238
Reviewed-by: Dirk Pranke <[email protected]>
Commit-Queue: Mustafa Emre Acer <[email protected]>
Cr-Commit-Position: refs/heads/master@{#617293}diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py
index 1ac9a8e..a724a95 100755
--- a/PRESUBMIT_test.py
+++ b/PRESUBMIT_test.py
@@ -1996,9 +1996,10 @@
MockOutputApi())
self.assertEqual(1, len(warnings))
self.assertEqual(self.GENERATE_SIGNATURES_MESSAGE, warnings[0].message)
- self.assertEqual(
- ['test_grd/IDS_TEST1.png.sha1', 'test_grd/IDS_TEST2.png.sha1'],
- warnings[0].items)
+ self.assertEqual([
+ os.path.join('test_grd', 'IDS_TEST1.png.sha1'),
+ os.path.join('test_grd', 'IDS_TEST2.png.sha1')
+ ], warnings[0].items)
input_api = self.makeInputApi([
MockAffectedFile('test.grd', self.NEW_GRD_CONTENTS2,
@@ -2007,46 +2008,72 @@
MockOutputApi())
self.assertEqual(1, len(warnings))
self.assertEqual(self.GENERATE_SIGNATURES_MESSAGE, warnings[0].message)
- self.assertEqual(['test_grd/IDS_TEST2.png.sha1'], warnings[0].items)
+ self.assertEqual([os.path.join('test_grd', 'IDS_TEST2.png.sha1')],
+ warnings[0].items)
def testUnnecessaryScreenshots(self):
# CL added a single message and added the png file, but not the sha1 file.
input_api = self.makeInputApi([
- MockAffectedFile('test.grd', self.NEW_GRD_CONTENTS1,
- self.OLD_GRD_CONTENTS, action='M'),
- MockAffectedFile('test_grd/IDS_TEST1.png', 'binary', action='A')])
+ MockAffectedFile(
+ 'test.grd',
+ self.NEW_GRD_CONTENTS1,
+ self.OLD_GRD_CONTENTS,
+ action='M'),
+ MockAffectedFile(
+ os.path.join('test_grd', 'IDS_TEST1.png'), 'binary', action='A')
+ ])
warnings = PRESUBMIT._CheckTranslationScreenshots(input_api,
MockOutputApi())
self.assertEqual(2, len(warnings))
self.assertEqual(self.DO_NOT_UPLOAD_PNG_MESSAGE, warnings[0].message)
- self.assertEqual(['test_grd/IDS_TEST1.png'], warnings[0].items)
+ self.assertEqual([os.path.join('test_grd', 'IDS_TEST1.png')],
+ warnings[0].items)
self.assertEqual(self.GENERATE_SIGNATURES_MESSAGE, warnings[1].message)
- self.assertEqual(['test_grd/IDS_TEST1.png.sha1'], warnings[1].items)
+ self.assertEqual([os.path.join('test_grd', 'IDS_TEST1.png.sha1')],
+ warnings[1].items)
# CL added two messages, one has a png. Expect two messages:
# - One for the unnecessary png.
# - Another one for missing .sha1 files.
input_api = self.makeInputApi([
- MockAffectedFile('test.grd', self.NEW_GRD_CONTENTS2,
- self.OLD_GRD_CONTENTS, action='M'),
- MockAffectedFile('test_grd/IDS_TEST1.png', 'binary', action='A')])
+ MockAffectedFile(
+ 'test.grd',
+ self.NEW_GRD_CONTENTS2,
+ self.OLD_GRD_CONTENTS,
+ action='M'),
+ MockAffectedFile(
+ os.path.join('test_grd', 'IDS_TEST1.png'), 'binary', action='A')
+ ])
warnings = PRESUBMIT._CheckTranslationScreenshots(input_api,
MockOutputApi())
self.assertEqual(2, len(warnings))
self.assertEqual(self.DO_NOT_UPLOAD_PNG_MESSAGE, warnings[0].message)
- self.assertEqual(['test_grd/IDS_TEST1.png'], warnings[0].items)
+ self.assertEqual([os.path.join('test_grd', 'IDS_TEST1.png')],
+ warnings[0].items)
self.assertEqual(self.GENERATE_SIGNATURES_MESSAGE, warnings[1].message)
- self.assertEqual(['test_grd/IDS_TEST1.png.sha1',
- 'test_grd/IDS_TEST2.png.sha1'], warnings[1].items)
+ self.assertEqual([
+ os.path.join('test_grd', 'IDS_TEST1.png.sha1'),
+ os.path.join('test_grd', 'IDS_TEST2.png.sha1')
+ ], warnings[1].items)
def testScreenshotsWithSha1(self):
# CL added two messages and their corresponding .sha1 files. No warnings.
input_api = self.makeInputApi([
- MockAffectedFile('test.grd', self.NEW_GRD_CONTENTS2,
- self.OLD_GRD_CONTENTS, action='M'),
- MockFile('test_grd/IDS_TEST1.png.sha1', 'binary', action='A'),
- MockFile('test_grd/IDS_TEST2.png.sha1', 'binary', action='A')])
+ MockAffectedFile(
+ 'test.grd',
+ self.NEW_GRD_CONTENTS2,
+ self.OLD_GRD_CONTENTS,
+ action='M'),
+ MockFile(
+ os.path.join('test_grd', 'IDS_TEST1.png.sha1'),
+ 'binary',
+ action='A'),
+ MockFile(
+ os.path.join('test_grd', 'IDS_TEST2.png.sha1'),
+ 'binary',
+ action='A')
+ ])
warnings = PRESUBMIT._CheckTranslationScreenshots(input_api,
MockOutputApi())
self.assertEqual([], warnings)
@@ -2055,36 +2082,60 @@
# Swap old contents with new contents, remove IDS_TEST1 and IDS_TEST2. The
# sha1 files associated with the messages should also be removed by the CL.
input_api = self.makeInputApi([
- MockAffectedFile('test.grd', self.OLD_GRD_CONTENTS,
- self.NEW_GRD_CONTENTS2, action='M'),
- MockFile('test_grd/IDS_TEST1.png.sha1', 'binary', ""),
- MockFile('test_grd/IDS_TEST2.png.sha1', 'binary', "")])
+ MockAffectedFile(
+ 'test.grd',
+ self.OLD_GRD_CONTENTS,
+ self.NEW_GRD_CONTENTS2,
+ action='M'),
+ MockFile(os.path.join('test_grd', 'IDS_TEST1.png.sha1'), 'binary', ""),
+ MockFile(os.path.join('test_grd', 'IDS_TEST2.png.sha1'), 'binary', "")
+ ])
warnings = PRESUBMIT._CheckTranslationScreenshots(input_api,
MockOutputApi())
self.assertEqual(1, len(warnings))
self.assertEqual(self.REMOVE_SIGNATURES_MESSAGE, warnings[0].message)
- self.assertEqual(['test_grd/IDS_TEST1.png.sha1',
- 'test_grd/IDS_TEST2.png.sha1'], warnings[0].items)
+ self.assertEqual([
+ os.path.join('test_grd', 'IDS_TEST1.png.sha1'),
+ os.path.join('test_grd', 'IDS_TEST2.png.sha1')
+ ], warnings[0].items)
# Same as above, but this time one of the .sha1 files is removed.
input_api = self.makeInputApi([
- MockAffectedFile('test.grd', self.OLD_GRD_CONTENTS,
- self.NEW_GRD_CONTENTS2, action='M'),
- MockFile('test_grd/IDS_TEST1.png.sha1', 'binary', ''),
- MockAffectedFile('test_grd/IDS_TEST2.png.sha1',
- '', 'old_contents', action='D')])
+ MockAffectedFile(
+ 'test.grd',
+ self.OLD_GRD_CONTENTS,
+ self.NEW_GRD_CONTENTS2,
+ action='M'),
+ MockFile(os.path.join('test_grd', 'IDS_TEST1.png.sha1'), 'binary', ''),
+ MockAffectedFile(
+ os.path.join('test_grd', 'IDS_TEST2.png.sha1'),
+ '',
+ 'old_contents',
+ action='D')
+ ])
warnings = PRESUBMIT._CheckTranslationScreenshots(input_api,
MockOutputApi())
self.assertEqual(1, len(warnings))
self.assertEqual(self.REMOVE_SIGNATURES_MESSAGE, warnings[0].message)
- self.assertEqual(['test_grd/IDS_TEST1.png.sha1'], warnings[0].items)
+ self.assertEqual([os.path.join('test_grd', 'IDS_TEST1.png.sha1')],
+ warnings[0].items)
# Remove both sha1 files. No presubmit warnings.
input_api = self.makeInputApi([
- MockAffectedFile('test.grd', self.OLD_GRD_CONTENTS,
- self.NEW_GRD_CONTENTS2, action='M'),
- MockFile('test_grd/IDS_TEST1.png.sha1', 'binary', action='D'),
- MockFile('test_grd/IDS_TEST2.png.sha1', 'binary', action='D')])
+ MockAffectedFile(
+ 'test.grd',
+ self.OLD_GRD_CONTENTS,
+ self.NEW_GRD_CONTENTS2,
+ action='M'),
+ MockFile(
+ os.path.join('test_grd', 'IDS_TEST1.png.sha1'),
+ 'binary',
+ action='D'),
+ MockFile(
+ os.path.join('test_grd', 'IDS_TEST2.png.sha1'),
+ 'binary',
+ action='D')
+ ])
warnings = PRESUBMIT._CheckTranslationScreenshots(input_api,
MockOutputApi())
self.assertEqual([], warnings)
