Reverting 53377, horks webkit waterfall.

depot_tools/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 355 matching lines @@
     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.checkString('hi', out[1][1])
     self.assertEquals(4, len(out[0]))
     self.assertEquals(2, len(out[1]))
 
     # So verify it works with --verbose.
     out = self.parseGclient(['status', '--deps', 'mac', '--verbose'],
         [['running', join(self.root_dir, 'src')],
+          ['running', join(self.root_dir, 'src', 'other')],
           ['running', join(self.root_dir, 'src', 'third_party', 'fpp')],
-          ['running', join(self.root_dir, 'src', 'other')],
           ['running', join(self.root_dir, 'src', 'third_party', 'prout')]])
     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.checkString('hi', out[2][1])
+    self.checkString('hi', out[1][1])
     self.assertEquals(4, len(out[0]))
-    self.assertEquals(1, len(out[1]))
-    self.assertEquals(2, len(out[2]))
-    self.assertEquals(1, len(out[3]))
-    self.assertEquals(4, len(out))
+    self.assertEquals(2, len(out[1]))
 
     # Revert implies --force implies running hooks without looking at pattern
     # matching.
     # TODO(maruel): In general, gclient revert output is wrong. It should output
     # the file list after some ___ running 'svn status'
     results = self.gclient(['revert', '--deps', 'mac'])
     out = self.splitBlock(results[0])
     self.assertEquals(7, len(out))
     self.checkString('', results[1])
     self.assertEquals(0, results[2])
@@ skipping 429 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()