Fix isolate_smoke_test.py on Windows.

tracerpt.exe throws a lot of spew and I didn't write it properly the first time.

NOTRY=true
TBR=mad@chromium.org
BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10453005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138706 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 6 deletions

diff --git a/tools/isolate/isolate_smoke_test.py b/tools/isolate/isolate_smoke_test.py
index a11d17f..34ec75b 100755
--- a/tools/isolate/isolate_smoke_test.py
+++ b/tools/isolate/isolate_smoke_test.py
@@ -474,15 +474,14 @@ class Isolate_trace(IsolateBase):
     self._expect_no_tree()
     self._expect_results(['fail.py'], None, None)
     expected = 'Failing'
+    lines = out.strip().splitlines()
+    self.assertTrue(lines.pop(0).startswith('WARNING'))
+    self.assertTrue(lines.pop(0).startswith('WARNING'))
     if sys.platform == 'win32':
       # Includes spew from tracerpt.exe.
-      self.assertTrue(out.startswith(expected))
+      self.assertEquals(expected, lines[0], (lines, expected))
     else:
-      lines = out.strip().splitlines()
-      self.assertEquals(3, len(lines))
-      self.assertTrue(lines[0].startswith('WARNING'))
-      self.assertTrue(lines[1].startswith('WARNING'))
-      self.assertEquals(expected, lines[2])
+      self.assertEquals([expected], lines)
 
   def test_missing_trailing_slash(self):
     try: