//tools/binary_size: Various enhancements to console.py

tools/binary_size/integration_test.py

 #!/usr/bin/env python
 # Copyright 2017 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.
 
 import copy
 import difflib
 import itertools
 import logging
 import os
@@ skipping 66 matching lines @@
   @_CompareWithGolden
   def test_ConsoleNullDiff(self):
     return _RunApp('console.py', '--output-directory', _TEST_DATA_DIR,
                    '--query', 'Diff(size_info1, size_info2)',
                    _TEST_MAP_PATH, _TEST_MAP_PATH)
 
   @_CompareWithGolden
   def test_ActualDiff(self):
     map1 = self._GetParsedMap()
     map2 = self._GetParsedMap()
-    map1.symbols.symbols.pop(-1)
-    map2.symbols.symbols.pop(0)
+    map1.symbols -= map1.symbols[0]
+    map2.symbols -= map2.symbols[-1]
     map1.symbols[1].size -= 10
     diff = models.Diff(map1, map2)
-    return describe.GenerateLines(diff)
+    return describe.GenerateLines(diff, verbose=True)
 
   @_CompareWithGolden
   def test_SymbolGroupMethods(self):
     all_syms = self._GetParsedMap().symbols
     global_syms = all_syms.WhereNameMatches('GLOBAL')
     # Tests Filter(), Inverted(), and __sub__().
     non_global_syms = global_syms.Inverted()
-    self.assertEqual(non_global_syms.symbols, (all_syms - global_syms).symbols)
+    self.assertEqual(non_global_syms, (all_syms - global_syms))
     # Tests Sorted() and __add__().
-    self.assertEqual(all_syms.Sorted().symbols,
-                     (global_syms + non_global_syms).Sorted().symbols)
+    self.assertEqual(all_syms.Sorted(),
+                     (global_syms + non_global_syms).Sorted())
     # Tests GroupByNamespace() and __len__().
     return itertools.chain(
         ['GroupByNamespace()'],
         describe.GenerateLines(all_syms.GroupByNamespace()),
         ['GroupByNamespace(depth=1)'],
         describe.GenerateLines(all_syms.GroupByNamespace(depth=1)),
         ['GroupByNamespace(depth=1, fallback=None)'],
         describe.GenerateLines(all_syms.GroupByNamespace(depth=1,
                                                          fallback=None)),
         ['GroupByNamespace(depth=1, min_count=2)'],
         describe.GenerateLines(all_syms.GroupByNamespace(depth=1, min_count=2)),
     )
 
 
 def main():
   argv = sys.argv
   if len(argv) > 1 and argv[1] == '--update':
     argv.pop(0)
     global update_goldens
     update_goldens = True
 
   unittest.main(argv=argv, verbosity=2)
 
 
 if __name__ == '__main__':
   main()