Fix tests on Windows

R=dpranke@chromium.org
BUG=
TEST=


Review URL: http://codereview.chromium.org/8366042

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@106866 0039d316-1c4b-4281-b951-d872f2087c98

tests/patch_test.py

@@ -7,6 +7,7 @@
 
 import logging
 import os
+import posixpath
 import sys
 import unittest
 
@@ -153,12 +154,13 @@ class PatchTest(unittest.TestCase):
     orig_name = patches.patches[4].filename
     orig_source_name = patches.patches[4].source_filename or orig_name
     patches.set_relpath(os.path.join('a', 'bb'))
-    expected = [os.path.join('a', 'bb', x) for x in expected]
+    # Expect posixpath all the time.
+    expected = [posixpath.join('a', 'bb', x) for x in expected]
     self.assertEquals(expected, patches.filenames)
     # Make sure each header is updated accordingly.
     header = []
-    new_name = os.path.join('a', 'bb', orig_name)
+    new_name = posixpath.join('a', 'bb', orig_name)
-    new_source_name = os.path.join('a', 'bb', orig_source_name)
+    new_source_name = posixpath.join('a', 'bb', orig_source_name)
     for line in RAW.PATCH.splitlines(True):
       if line.startswith('@@'):
         break

tests/subprocess2_test.py

@@ -168,7 +168,10 @@ class Subprocess2Test(unittest.TestCase):
          stdout=subprocess2.VOID,
          stderr=subprocess2.PIPE)
     self.assertEquals(None, out)
-    self.assertEquals('a\nbb\nccc\n', err)
+    expected = 'a\nbb\nccc\n'
+    if sys.platform == 'win32':
+      expected = expected.replace('\n', '\r\n')
+    self.assertEquals(expected, err)
     self.assertEquals(0, code)
 
   def test_stderr_void(self):