| Index: tools/isolate/isolate_smoke_test.py
|
| diff --git a/tools/isolate/isolate_smoke_test.py b/tools/isolate/isolate_smoke_test.py
|
| index f5ba246cb623bb442a15bd9cfe6a74cca07fef98..db62c630a646e82114596895015e8847d443b511 100755
|
| --- a/tools/isolate/isolate_smoke_test.py
|
| +++ b/tools/isolate/isolate_smoke_test.py
|
| @@ -79,7 +79,9 @@ class IsolateBase(unittest.TestCase):
|
| def _result_tree(self):
|
| actual = []
|
| for root, _dirs, files in os.walk(self.outdir):
|
| - actual.extend(os.path.join(root, f)[len(self.outdir)+1:] for f in files)
|
| + actual.extend(
|
| + os.path.join(root, f)[len(self.outdir)+1:].replace(os.path.sep, '/')
|
| + for f in files)
|
| return sorted(actual)
|
|
|
| def _expected_tree(self):
|
| @@ -444,8 +446,11 @@ class Isolate_trace(IsolateBase):
|
| out = e.output
|
| self._expect_no_tree()
|
| self._expected_result(['fail.py'], None)
|
| - expected = 'Failure: 1\nFailing\n\n'
|
| - self.assertEquals(expected, out)
|
| + # In theory, there should be 2 \n at the end of expected but for an
|
| + # unknown reason there's 3 \n on Windows so just rstrip() and compare the
|
| + # text, that's sufficient for this test.
|
| + expected = 'Failure: 1\nFailing'
|
| + self.assertEquals(expected, out.rstrip())
|
|
|
| def test_missing_trailing_slash(self):
|
| try:
|
|
|