Fix test failures on Ubuntu/Trusty.

tests/gclient_smoketest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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 1557 matching lines @@
     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.assertEquals(3, len(out[0]))

[Sam Clegg, 2014/12/10 21:25:38]

I'm really not sure why the number of elements changed from 2 to 3 here.

The 3 elements array I have looks like this:


[['running', 'svn update --revision BASE --ignore-externals',
'/tmp/trialy3bcnW/__main__.GClientSmokeFromCheckout.testRevertAndStatus/foo/bar'],
"Updating '.':", 'At revision 1.']

Not sure what it is supposed to look like.

The use of checkString() here looks like its a bug right?

[M-A Ruel, 2014/12/11 01:22:46]

Bah, this could be just removed, it's not going to be changed significantly in
the future. And yes it looks like a bug.

[Sam Clegg, 2014/12/11 01:28:45]

Should I remove this test then?

I could find a precise machine to test this change on if you think the test is
useful.

[M-A Ruel, 2014/12/11 01:57:00]

No need.

[Sam Clegg, 2014/12/11 02:24:25]

I looked into it and added comment.  Can remove this test if you'd rather.

+    self.assertEquals(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'], [])
@@ skipping 48 matching lines @@
 
   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()