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

tools/binary_size/integration_test.py

Index: tools/binary_size/integration_test.py
diff --git a/tools/binary_size/integration_test.py b/tools/binary_size/integration_test.py
index 670cb97c7fe9bd0c51bd5f1ad7ae8367d431c3e9..0523d913be9da943e90a926d81ce61736f47b06c 100755
--- a/tools/binary_size/integration_test.py
+++ b/tools/binary_size/integration_test.py
@@ -84,11 +84,11 @@ class IntegrationTest(unittest.TestCase):
   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):
@@ -96,10 +96,10 @@ class IntegrationTest(unittest.TestCase):
     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()'],