Set tracing categories explicitly in Clovis and Sandwich

tools/android/loading/tracing_unittest.py

 # Copyright 2016 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 collections
 import copy
 import logging
 import operator
 import unittest
 
+import clovis_constants

[blundell, 2016/06/06 16:06:38]

nit: this seems like a minor layering violation. any reason this test shouldn't
just define its own arbitrary set of initial categories?

[pasko, 2016/06/06 17:30:52]

It does not look like a layering violation to me. If tracing.py depends on
clovis_constants.py, it should be fine to depend on clovis_constants in
tracing_unittest.
Agreed, the initial categories are not needed here. I should have given it more
thought instead of mechanically mirroring what was done before.

Removed.

 import devtools_monitor
 
 from tracing import (Event, TracingTrack, _IntervalTree)
 
 
 class TracingTrackTestCase(unittest.TestCase):
   _MIXED_EVENTS = [
       {'ts': 3, 'ph': 'N', 'id': 1, 'args': {'name': 'A'}},
       {'ts': 5, 'ph': 'X', 'dur': 1, 'args': {'name': 'B'}},
       {'ts': 7, 'ph': 'D', 'id': 1},
@@ skipping 14 matching lines @@
       {'ts': 10, 'ph': 'X', 'dur': 2, 'pid': 2, 'tid': 2,
        'args': {'name': 'D'}},
       {'ts': 13, 'ph': 'X', 'dur': 1, 'pid': 2, 'tid': 1,
        'args': {'name': 'F'}},
       {'ts': 12, 'ph': 'X', 'dur': 3, 'pid': 2, 'tid': 1,
        'args': {'name': 'E'}}]
 
   def setUp(self):
     self.tree_threshold = _IntervalTree._TRESHOLD
     _IntervalTree._TRESHOLD = 2  # Expose more edge cases in the tree.
-    self.track = TracingTrack(None, additional_categories=('A', 'B', 'C', 'D'))
+    self.track = TracingTrack(None,
+        clovis_constants.DEFAULT_CATEGORIES + ['A', 'B', 'C', 'D'])

[gabadie, 2016/06/06 16:17:30]

Why is it needed to add clovis_constants.DEFAULT_CATEGORIES? Looks like it can
be avoided. Unless there is an assertion here that I believe could also be
triggered in sandwich?

[pasko, 2016/06/06 17:30:52]

You are right, this is not needed. Also blundell@ raised the same concern, so I
removed the dependency on clovis_constants entirely from this file. Does not
affect how things are tested here.

 
   def tearDown(self):
     _IntervalTree._TRESHOLD = self.tree_threshold
 
   def EventToMicroseconds(self, event):
     result = copy.deepcopy(event)
     if 'ts' in result:
       result['ts'] *= 1000
     if 'dur' in result:
       result['dur'] *= 1000
@@ skipping 297 matching lines @@
     self.assertListEqual([tracing_events[0], tracing_events[3]],
                          filtered_events)
     filtered_events = self.track.Filter(categories=set(['Z'])).GetEvents()
     self.assertEquals(0, len(filtered_events))
     filtered_events = self.track.Filter(categories=set(['B', 'C'])).GetEvents()
     self.assertEquals(3, len(filtered_events))
     self.assertListEqual(tracing_events[1:], filtered_events)
     self.assertSetEqual(
         set('A'), self.track.Filter(categories=set('A')).Categories())
 
-  def testAdditionalCategories(self):
-    track = TracingTrack(None, additional_categories=('best-category-ever',))
-    self.assertIn('best-category-ever', track.Categories())
-    # Cannot re-enable a category.
-    with self.assertRaises(AssertionError):
-      TracingTrack(None, additional_categories=('cc',))
-    # Cannot disable categories via |additional_categories|.
-    with self.assertRaises(AssertionError):
-      TracingTrack(None, additional_categories=('-best-category-ever',))
-
-  def testDisabledCategories(self):
-    track = TracingTrack(None, disabled_categories=('toplevel',))
-    self.assertNotIn('toplevel', track.Categories())
-    self.assertIn('-toplevel', track.Categories())
-    # Can only disable categories that are enabled by default.
-    with self.assertRaises(AssertionError):
-      TracingTrack(None, disabled_categories=('best-category-ever',))
-    with self.assertRaises(AssertionError):
-      TracingTrack(None, disabled_categories=('cc',))
-
   def _HandleEvents(self, events):
     self.track.Handle('Tracing.dataCollected', {'params': {'value': [
         self.EventToMicroseconds(e) for e in events]}})
 
 
 class IntervalTreeTestCase(unittest.TestCase):
   class FakeEvent(object):
     def __init__(self, start_msec, end_msec):
       self.start_msec = start_msec
       self.end_msec = end_msec
@@ skipping 66 matching lines @@
                    'cat': 'bar,baz,bizbiz',
                    'ph': 'X',
                    'ts': 0, 'dur': 0})
     self.assertTrue(event.Matches('bar', 'foo'))
     self.assertTrue(event.Matches('baz', 'foo'))
     self.assertFalse(event.Matches('bar', 'biz'))
     self.assertFalse(event.Matches('biz', 'foo'))
 
 if __name__ == '__main__':
   unittest.main()