| Index: tools/telemetry/telemetry/core/backends/chrome/tracing_backend_unittest.py
|
| diff --git a/tools/telemetry/telemetry/core/backends/chrome/tracing_backend_unittest.py b/tools/telemetry/telemetry/core/backends/chrome/tracing_backend_unittest.py
|
| index 0b2d56939ff2370071610b437e871f2afa6e8e30..1fdcdd483a776ef3c0809fc0d74e00616d219c25 100644
|
| --- a/tools/telemetry/telemetry/core/backends/chrome/tracing_backend_unittest.py
|
| +++ b/tools/telemetry/telemetry/core/backends/chrome/tracing_backend_unittest.py
|
| @@ -8,95 +8,10 @@ import logging
|
| import unittest
|
|
|
| from telemetry.core import util
|
| -from telemetry.core.backends.chrome import tracing_backend
|
| from telemetry.timeline import tracing_timeline_data
|
| from telemetry.timeline.model import TimelineModel
|
| from telemetry.unittest import tab_test_case
|
|
|
| -class CategoryFilterTest(unittest.TestCase):
|
| - def testIsSubset(self):
|
| - b = tracing_backend.CategoryFilter(None)
|
| - a = tracing_backend.CategoryFilter(None)
|
| - self.assertEquals(a.IsSubset(b), True)
|
| -
|
| - b = tracing_backend.CategoryFilter(None)
|
| - a = tracing_backend.CategoryFilter("test1,test2")
|
| - self.assertEquals(a.IsSubset(b), True)
|
| -
|
| - b = tracing_backend.CategoryFilter(None)
|
| - a = tracing_backend.CategoryFilter("-test1,-test2")
|
| - self.assertEquals(a.IsSubset(b), True)
|
| -
|
| - b = tracing_backend.CategoryFilter("test1,test2")
|
| - a = tracing_backend.CategoryFilter(None)
|
| - self.assertEquals(a.IsSubset(b), None)
|
| -
|
| - b = tracing_backend.CategoryFilter(None)
|
| - a = tracing_backend.CategoryFilter("test*")
|
| - self.assertEquals(a.IsSubset(b), None)
|
| -
|
| - b = tracing_backend.CategoryFilter("test?")
|
| - a = tracing_backend.CategoryFilter(None)
|
| - self.assertEquals(a.IsSubset(b), None)
|
| -
|
| - b = tracing_backend.CategoryFilter("test1")
|
| - a = tracing_backend.CategoryFilter("test1,test2")
|
| - self.assertEquals(a.IsSubset(b), False)
|
| -
|
| - b = tracing_backend.CategoryFilter("-test1")
|
| - a = tracing_backend.CategoryFilter("test1")
|
| - self.assertEquals(a.IsSubset(b), False)
|
| -
|
| - b = tracing_backend.CategoryFilter("test1,test2")
|
| - a = tracing_backend.CategoryFilter("test2,test1")
|
| - self.assertEquals(a.IsSubset(b), True)
|
| -
|
| - b = tracing_backend.CategoryFilter("-test1,-test2")
|
| - a = tracing_backend.CategoryFilter("-test2")
|
| - self.assertEquals(a.IsSubset(b), False)
|
| -
|
| - b = tracing_backend.CategoryFilter("disabled-by-default-test1")
|
| - a = tracing_backend.CategoryFilter(
|
| - "disabled-by-default-test1,disabled-by-default-test2")
|
| - self.assertEquals(a.IsSubset(b), False)
|
| -
|
| - b = tracing_backend.CategoryFilter("disabled-by-default-test1")
|
| - a = tracing_backend.CategoryFilter("disabled-by-default-test2")
|
| - self.assertEquals(a.IsSubset(b), False)
|
| -
|
| - def testIsSubsetWithSyntheticDelays(self):
|
| - b = tracing_backend.CategoryFilter("DELAY(foo;0.016)")
|
| - a = tracing_backend.CategoryFilter("DELAY(foo;0.016)")
|
| - self.assertEquals(a.IsSubset(b), True)
|
| -
|
| - b = tracing_backend.CategoryFilter("DELAY(foo;0.016)")
|
| - a = tracing_backend.CategoryFilter(None)
|
| - self.assertEquals(a.IsSubset(b), True)
|
| -
|
| - b = tracing_backend.CategoryFilter(None)
|
| - a = tracing_backend.CategoryFilter("DELAY(foo;0.016)")
|
| - self.assertEquals(a.IsSubset(b), False)
|
| -
|
| - b = tracing_backend.CategoryFilter("DELAY(foo;0.016)")
|
| - a = tracing_backend.CategoryFilter("DELAY(foo;0.032)")
|
| - self.assertEquals(a.IsSubset(b), False)
|
| -
|
| - b = tracing_backend.CategoryFilter("DELAY(foo;0.016;static)")
|
| - a = tracing_backend.CategoryFilter("DELAY(foo;0.016;oneshot)")
|
| - self.assertEquals(a.IsSubset(b), False)
|
| -
|
| - b = tracing_backend.CategoryFilter("DELAY(foo;0.016),DELAY(bar;0.1)")
|
| - a = tracing_backend.CategoryFilter("DELAY(bar;0.1),DELAY(foo;0.016)")
|
| - self.assertEquals(a.IsSubset(b), True)
|
| -
|
| - b = tracing_backend.CategoryFilter("DELAY(foo;0.016),DELAY(bar;0.1)")
|
| - a = tracing_backend.CategoryFilter("DELAY(bar;0.1)")
|
| - self.assertEquals(a.IsSubset(b), True)
|
| -
|
| - b = tracing_backend.CategoryFilter("DELAY(foo;0.016),DELAY(bar;0.1)")
|
| - a = tracing_backend.CategoryFilter("DELAY(foo;0.032),DELAY(bar;0.1)")
|
| - self.assertEquals(a.IsSubset(b), False)
|
| -
|
|
|
| class TracingBackendTest(tab_test_case.TabTestCase):
|
| def _StartServer(self):
|
|
|