Fix test failures on Ubuntu/Trusty.

tests/scm_unittest.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.
 
 """Unit tests for scm.py."""
 
 import logging
 import os
 import sys
@@ skipping 490 matching lines @@
     added_and_removed = join('added_and_removed')
     with open(added_and_removed, 'w') as f:
       f.write('oh')
     self._capture(['add', added_and_removed])
     scm.os.remove(added_and_removed)
     # Make sure a tree of directories can be removed.
     scm.os.makedirs(join('new_dir', 'subdir'))
     with open(join('new_dir', 'subdir', 'newfile'), 'w') as f:
       f.write('ah!')
     self._capture(['add', join('new_dir')])
-    self._capture(['add', join('new_dir', 'subdir')])
-    self._capture(['add', join('new_dir', 'subdir', 'newfile')])
+    #self._capture(['add', join('new_dir', 'subdir')])
+    #self._capture(['add', join('new_dir', 'subdir', 'newfile')])

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

I was getting svn errors here, presumably because the first 'add' operation is
recursive (at least in my version of svn).

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

Ok, it wasn't previously.

     # A random file in an added directory confuses svn.
     scm.os.makedirs(join('new_dir2', 'subdir'))
     with open(join('new_dir2', 'subdir', 'newfile'), 'w') as f:
       f.write('ah!')
     self._capture(['add', join('new_dir2')])
-    self._capture(['add', join('new_dir2', 'subdir')])
-    self._capture(['add', join('new_dir2', 'subdir', 'newfile')])
+    #self._capture(['add', join('new_dir2', 'subdir')])
+    #self._capture(['add', join('new_dir2', 'subdir', 'newfile')])
     with open(join('new_dir2', 'subdir', 'unversionedfile'), 'w') as f:
       f.write('unadded file!')
 
     scm.SVN.Revert(self.svn_root)
     self._capture(['update', '--revision', 'base'])
 
-    self.assertTree(self.tree, self.svn_root)
+    # TODO(sbc): find out why this is failing
+    #self.assertTree(self.tree, self.svn_root)
+
     # Asserting the tree is not sufficient, svn status must come out clear too.
-    self.assertEquals('', self._capture(['status']))
+    #self.assertEquals('', self._capture(['status']))

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

I couldn't figure this one out.

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

np

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

Should I disable this test then?  Or delete it?  Maybe I'll see it passes on
precise and disable it with a comment if it does.

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

Delete.

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

Done.

 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     logging.basicConfig(level=logging.DEBUG)
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: