Improve the testing situation 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 120 matching lines @@
     """Work around svn status difference between svn 1.5 and svn 1.6
     I don't know why but on Windows they are reversed. So sorts the items."""
     for i in xrange(len(out)):
       if len(out[i]) < 2:
         continue
       out[i] = [out[i][0]] + sorted([x[1:].strip() for x in out[i][1:]])
     return out
 
 
 class GClientSmoke(GClientSmokeBase):
+  """Doesn't require neither svnserve nor git-daemon."""
   def testHelp(self):
     """testHelp: make sure no new command was added."""
     result = self.gclient(['help'])
     # Roughly, not too short, not too long.
     self.assertTrue(1000 < len(result[0]) and len(result[0]) < 2000)
     self.assertEquals(0, len(result[1]))
     self.assertEquals(0, result[2])
 
   def testUnknown(self):
     result = self.gclient(['foo'])
@@ skipping 94 matching lines @@
         'deps = { "src": "%strunk/src" }' % (self.svn_base))
     src = join(self.root_dir, 'src')
     os.mkdir(src)
     res = self.gclient(['status', '--jobs', '1'], src)
     self.checkBlock(res[0], [('running', deps), ('running', src)])
 
 
 class GClientSmokeSVN(GClientSmokeBase):
   def setUp(self):
     GClientSmokeBase.setUp(self)
-    self.FAKE_REPOS.setUpSVN()
+    self.enabled = self.FAKE_REPOS.setUpSVN()
 
   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', 'running', 'running', 'running'])
     tree = self.mangle_svn_tree(
         ('trunk/src@2', 'src'),
@@ skipping 30 matching lines @@
         ('trunk/third_party/foo@1', 'src/third_party/foo'),
         ('trunk/other@2', 'src/other'),
         ('trunk/third_party/foo@2', 'src/third_party/prout'))
     tree['src/file/other/DEPS'] = (
         self.FAKE_REPOS.svn_revs[2]['trunk/other/DEPS'])
     tree['src/svn_hooked1'] = 'svn_hooked1'
     self.assertTree(tree)
 
   def testSyncIgnoredSolutionName(self):
     """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', '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'])
     tree['src/svn_hooked1'] = 'svn_hooked1'
     self.assertTree(tree)
 
   def testSyncNoSolutionName(self):
     # When no solution name is provided, gclient uses the first solution listed.
+    if not self.enabled:
+      return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     self.parseGclient(['sync', '--deps', 'mac', '-r', '1', '--jobs', '1'],
                       ['running', 'running', 'running', 'running'])
     tree = self.mangle_svn_tree(
         ('trunk/src@1', 'src'),
         ('trunk/third_party/foo@2', 'src/third_party/fpp'),
         ('trunk/other@1', 'src/other'),
         ('trunk/third_party/foo@2', 'src/third_party/prout'))
     self.assertTree(tree)
 
   def testSyncJobs(self):
+    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', 'running', 'running', 'running'],
@@ skipping 34 matching lines @@
         ('trunk/third_party/foo@2', 'src/third_party/fpp'),
         ('trunk/third_party/foo@1', 'src/third_party/foo'),
         ('trunk/other@2', 'src/other'),
         ('trunk/third_party/foo@2', 'src/third_party/prout'))
     tree['src/file/other/DEPS'] = (
         self.FAKE_REPOS.svn_revs[2]['trunk/other/DEPS'])
     tree['src/svn_hooked1'] = 'svn_hooked1'
     self.assertTree(tree)
 
   def testRevertAndStatus(self):
+    if not self.enabled:
+      return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     # Tested in testSync.
     self.gclient(['sync', '--deps', 'mac'])
     write(join(self.root_dir, 'src', 'other', 'hi'), 'Hey!')
 
     out = self.parseGclient(['status', '--deps', 'mac', '--jobs', '1'],
                             [['running', join(self.root_dir, 'src')],
                              ['running', join(self.root_dir, 'src', 'other')]])
     out = self.svnBlockCleanup(out)
     self.checkString('file', out[0][1])
@@ skipping 28 matching lines @@
     out = self.svnBlockCleanup(out)
     self.checkString('file', out[0][1])
     self.checkString('other', out[0][2])
     self.checkString('svn_hooked1', out[0][3])
     self.checkString('svn_hooked2', out[0][4])
     self.checkString(join('third_party', 'foo'), out[0][5])
     self.assertEquals(6, len(out[0]))
     self.assertEquals(1, len(out))
 
   def testRevertAndStatusDepsOs(self):
+    if not self.enabled:
+      return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     # Tested in testSync.
     self.gclient(['sync', '--deps', 'mac', '--revision', 'src@1'])
     write(join(self.root_dir, 'src', 'other', 'hi'), 'Hey!')
 
     # Without --verbose, gclient won't output the directories without
     # modification.
     out = self.parseGclient(['status', '--deps', 'mac', '--jobs', '1'],
                             [['running', join(self.root_dir, 'src')],
                              ['running', join(self.root_dir, 'src', 'other')]])
@@ skipping 41 matching lines @@
 
     out = self.parseGclient(['status', '--deps', 'mac', '--jobs', '1'],
                             [['running', join(self.root_dir, 'src')]])
     out = self.svnBlockCleanup(out)
     self.checkString('other', out[0][1])
     self.checkString(join('third_party', 'fpp'), out[0][2])
     self.checkString(join('third_party', 'prout'), out[0][3])
     self.assertEquals(4, len(out[0]))
 
   def testRunHooks(self):
+    if not self.enabled:
+      return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     self.gclient(['sync', '--deps', 'mac'])
     out = self.parseGclient(['runhooks', '--deps', 'mac'],
                             ['running', 'running'])
     self.checkString(1, len(out[0]))
     self.checkString(1, len(out[1]))
 
   def testRunHooksDepsOs(self):
+    if not self.enabled:
+      return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     self.gclient(['sync', '--deps', 'mac', '--revision', 'src@1'])
     out = self.parseGclient(['runhooks', '--deps', 'mac'], [])
     self.assertEquals([], out)
 
   def testRevInfo(self):
+    if not self.enabled:
+      return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     self.gclient(['sync', '--deps', 'mac'])
     results = self.gclient(['revinfo', '--deps', 'mac'])
     out = ('src: %(base)s/src\n'
            'src/file/other: File("%(base)s/other/DEPS")\n'
            'src/other: %(base)s/other\n'
            'src/third_party/foo: %(base)s/third_party/foo@1\n' %
           { 'base': self.svn_base + 'trunk' })
     self.check((out, '', 0), results)
     results = self.gclient(['revinfo', '--deps', 'mac', '--actual'])
@@ skipping 18 matching lines @@
            '    },\n'
            '    "safesync_url": "",\n'
            '  },\n'
            ']\n\n' %
           { 'base': self.svn_base + 'trunk' })
     self.check((out, '', 0), results)
 
   def testWrongDirectory(self):
     # Check that we're not using a .gclient configuration which only talks
     # about a subdirectory src when we're in a different subdirectory src-other.
+    if not self.enabled:
+      return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     self.gclient(['sync'])
     other_src = join(self.root_dir, 'src-other')
     os.mkdir(other_src)
     res = ('', 'Error: client not configured; see \'gclient config\'\n', 1)
     self.check(res, self.gclient(['status'], other_src))
 
   def testCorrectDirectory(self):
     # Check that when we're in the subdirectory src, the .gclient configuration
     # is used.
+    if not self.enabled:
+      return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     self.gclient(['sync'])
     src = join(self.root_dir, 'src')
     res = self.gclient(['status', '--jobs', '1'], src)
     self.checkBlock(res[0], [('running', src)])
 
   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', '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.
     os.remove(join(self.root_dir, '.gclient_entries'))
     src = join(self.root_dir, 'src')
     res = self.gclient(['sync', '--jobs', '1'], src)
     self.checkBlock(res[0],
                     ['running', 'running', 'running'])
 
 
@@ skipping 212 matching lines @@
             'hash1': self.githash('repo_1', 2),
             'hash2': self.githash('repo_2', 1),
             'hash3': self.githash('repo_3', 2),
           })
     self.check((out, '', 0), results)
 
 
 class GClientSmokeBoth(GClientSmokeBase):
   def setUp(self):
     GClientSmokeBase.setUp(self)
-    self.FAKE_REPOS.setUpSVN()
-    self.enabled = self.FAKE_REPOS.setUpGIT()
+    self.enabled = self.FAKE_REPOS.setUpSVN() and self.FAKE_REPOS.setUpGIT()
 
   def testMultiSolutions(self):
     if not self.enabled:
       return
     self.gclient(['config', '--spec',
         'solutions=['
         '{"name": "src",'
         ' "url": "' + self.svn_base + 'trunk/src/"},'
         '{"name": "src-git",'
         '"url": "' + self.git_base + 'repo_1"}]'])
@@ skipping 144 matching lines @@
     expected = [(scm, bases[scm] + url, os.path.join(self.root_dir, path))
                 for (scm, url, path) in expected_source]
 
     self.assertEquals(sorted(entries), sorted(expected))
 
 
 class GClientSmokeFromCheckout(GClientSmokeBase):
   # WebKit abuses this. It has a .gclient and a DEPS from a checkout.
   def setUp(self):
     GClientSmokeBase.setUp(self)
-    self.FAKE_REPOS.setUpSVN()
+    self.enabled = self.FAKE_REPOS.setUpSVN()
     os.rmdir(self.root_dir)
-    check_call(['svn', 'checkout', 'svn://127.0.0.1/svn/trunk/webkit',
-        self.root_dir, '-q',
-        '--non-interactive', '--no-auth-cache',
-        '--username', 'user1', '--password', 'foo'])
+    if self.enabled:
+      check_call(['svn', 'checkout', 'svn://127.0.0.1/svn/trunk/webkit',
+          self.root_dir, '-q',
+          '--non-interactive', '--no-auth-cache',
+          '--username', 'user1', '--password', 'foo'])
 
   def testSync(self):
+    if not self.enabled:
+      return
     self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
         ['running', 'running'])
     tree = self.mangle_svn_tree(
         ('trunk/webkit@2', ''),
         ('trunk/third_party/foo@1', 'foo/bar'))
     self.assertTree(tree)
 
   def testRevertAndStatus(self):
+    if not self.enabled:
+      return
     self.gclient(['sync'])
 
     # TODO(maruel): This is incorrect.
     out = self.parseGclient(['status', '--deps', 'mac', '--jobs', '1'], [])
 
     # Revert implies --force implies running hooks without looking at pattern
     # matching.
     results = self.gclient(['revert', '--deps', 'mac', '--jobs', '1'])
     out = self.splitBlock(results[0])
     self.assertEquals(2, len(out))
     self.checkString(2, len(out[0]))
     self.checkString(2, len(out[1]))
     self.checkString('foo', out[1][1])
     self.checkString('', results[1])
     self.assertEquals(0, results[2])
     tree = self.mangle_svn_tree(
         ('trunk/webkit@2', ''),
         ('trunk/third_party/foo@1', 'foo/bar'))
     self.assertTree(tree)
 
     # TODO(maruel): This is incorrect.
     out = self.parseGclient(['status', '--deps', 'mac'], [])
 
   def testRunHooks(self):
+    if not self.enabled:
+      return
     # Hooks aren't really tested for now since there is no hook defined.
     self.gclient(['sync', '--deps', 'mac'])
     out = self.parseGclient(['runhooks', '--deps', 'mac'], ['running'])
     self.assertEquals(1, len(out))
     self.assertEquals(2, len(out[0]))
     self.assertEquals(3, len(out[0][0]))
     self.checkString('foo', out[0][1])
     tree = self.mangle_svn_tree(
         ('trunk/webkit@2', ''),
         ('trunk/third_party/foo@1', 'foo/bar'))
     self.assertTree(tree)
 
   def testRevInfo(self):
+    if not self.enabled:
+      return
     self.gclient(['sync', '--deps', 'mac'])
     results = self.gclient(['revinfo', '--deps', 'mac'])
     expected = (
         './: None\nfoo/bar: svn://127.0.0.1/svn/trunk/third_party/foo@1\n',
         '', 0)
     self.check(expected, results)
     # TODO(maruel): To be added after the refactor.
     #results = self.gclient(['revinfo', '--snapshot'])
     #expected = (
     #    './: None\nfoo/bar: svn://127.0.0.1/svn/trunk/third_party/foo@1\n',
     #    '', 0)
     #self.check(expected, results)
 
   def testRest(self):
+    if not self.enabled:
+      return
     self.gclient(['sync'])
     # TODO(maruel): This is incorrect, it should run on ./ too.
     out = self.parseGclient(
         ['cleanup', '--deps', 'mac', '--verbose', '--jobs', '1'],
         [('running', join(self.root_dir, 'foo', 'bar'))])
     out = self.parseGclient(
         ['diff', '--deps', 'mac', '--verbose', '--jobs', '1'],
         [('running', join(self.root_dir, 'foo', 'bar'))])
 
 
 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()