Fix test failures on Ubuntu/Trusty.

testing_support/fake_repos.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Generate fake repositories for testing."""
 
 import atexit
 import datetime
 import errno
@@ skipping 865 matching lines @@
   def assertTree(self, tree, tree_root=None):
     """Diff the checkout tree with a dict."""
     if not tree_root:
       tree_root = self.root_dir
     actual = read_tree(tree_root)
     diff = dict_diff(tree, actual)
     if diff:
       logging.debug('Actual %s\n%s' % (tree_root, pprint.pformat(actual)))
       logging.debug('Expected\n%s' % pprint.pformat(tree))
       logging.debug('Diff\n%s' % pprint.pformat(diff))
-      self.assertEquals(diff, [])
+    self.assertEquals(diff, {})
 
   def mangle_svn_tree(self, *args):
     """Creates a 'virtual directory snapshot' to compare with the actual result
     on disk."""
     result = {}
     for item, new_root in args:
       old_root, rev = item.split('@', 1)
       tree = self.FAKE_REPOS.svn_revs[int(rev)]
       for k, v in tree.iteritems():
         if not k.startswith(old_root):
@@ skipping 32 matching lines @@
     fake.set_up_git()
     print('Fake setup, press enter to quit or Ctrl-C to keep the checkouts.')
     sys.stdin.readline()
   except KeyboardInterrupt:
     trial_dir.TrialDir.SHOULD_LEAK.leak = True
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))