Fixes the remaining failures gclient_smoketest on Windows....

tests/gclient_smoketest.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Smoke tests for gclient.py.
 
 Shell out 'gclient' and run basic conformance tests.
 
 This test assumes GClientSmokeBase.URL_BASE is valid.
@@ skipping 247 matching lines @@
   def testSync(self):
     # TODO(maruel): safesync.
     if not self.enabled:
       return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     # Test unversioned checkout.
     self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
                       ['running', 'running',
                        # This is due to the way svn update is called for a
                        # single file when File() is used in a DEPS file.
-                       ('running', self.root_dir + '/src/file/other'),
+                       ('running', os.path.join(self.root_dir, 'src', 'file', 'other')),
                        'running', 'running', 'running', 'running'])
     tree = self.mangle_svn_tree(
         ('trunk/src@2', 'src'),
         ('trunk/third_party/foo@1', 'src/third_party/foo'),
         ('trunk/other@2', 'src/other'))
     tree['src/file/other/DEPS'] = (
         self.FAKE_REPOS.svn_revs[2]['trunk/other/DEPS'])
     tree['src/svn_hooked1'] = 'svn_hooked1'
     self.assertTree(tree)
 
@@ skipping 32 matching lines @@
     """TODO(maruel): This will become an error soon."""
     if not self.enabled:
       return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     results = self.gclient(
         ['sync', '--deps', 'mac', '-r', 'invalid@1', '--jobs', '1'])
     self.checkBlock(results[0], [
         'running', 'running',
         # This is due to the way svn update is called for a single file when
         # File() is used in a DEPS file.
-        ('running', self.root_dir + '/src/file/other'),
+        ('running', os.path.join(self.root_dir, 'src', 'file', 'other')),
         'running', 'running', 'running', 'running'])
     self.checkString('Please fix your script, having invalid --revision flags '
         'will soon considered an error.\n', results[1])
     self.assertEquals(0, results[2])
     tree = self.mangle_svn_tree(
         ('trunk/src@2', 'src'),
         ('trunk/third_party/foo@1', 'src/third_party/foo'),
         ('trunk/other@2', 'src/other'))
     tree['src/file/other/DEPS'] = (
         self.FAKE_REPOS.svn_revs[2]['trunk/other/DEPS'])
@@ skipping 18 matching lines @@
     if not self.enabled:
       return
     # TODO(maruel): safesync.
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     # Test unversioned checkout.
     self.parseGclient(
         ['sync', '--deps', 'mac', '--jobs', '8'],
         ['running', 'running',
         # This is due to the way svn update is called for a
         # single file when File() is used in a DEPS file.
-        ('running', self.root_dir + '/src/file/other'),
+        ('running', os.path.join(self.root_dir, 'src', 'file', 'other')),
         'running', 'running', 'running', 'running'],
         untangle=True)
     tree = self.mangle_svn_tree(
         ('trunk/src@2', 'src'),
         ('trunk/third_party/foo@1', 'src/third_party/foo'),
         ('trunk/other@2', 'src/other'))
     tree['src/file/other/DEPS'] = (
         self.FAKE_REPOS.svn_revs[2]['trunk/other/DEPS'])
     tree['src/svn_hooked1'] = 'svn_hooked1'
     self.assertTree(tree)
@@ skipping 226 matching lines @@
   def testInitialCheckoutNotYetDone(self):
     # Check that gclient can be executed when the initial checkout hasn't been
     # done yet.
     if not self.enabled:
       return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     self.parseGclient(['sync', '--jobs', '1'],
                       ['running', 'running',
                        # This is due to the way svn update is called for a
                        # single file when File() is used in a DEPS file.
-                       ('running', self.root_dir + '/src/file/other'),
+                       ('running', os.path.join(self.root_dir, 'src', 'file', 'other')),
                        'running', 'running', 'running', 'running'])
 
   def testInitialCheckoutFailed(self):
     # Check that gclient can be executed from an arbitrary sub directory if the
     # initial checkout has failed.
     if not self.enabled:
       return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     self.gclient(['sync'])
     # Cripple the checkout.
@@ skipping 482 matching lines @@
 if __name__ == '__main__':
   if '-c' in sys.argv:
     COVERAGE = True
     sys.argv.remove('-c')
     if os.path.exists('.coverage'):
       os.remove('.coverage')
     os.environ['COVERAGE_FILE'] = os.path.join(
         os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
         '.coverage')
   unittest.main()