Add cache_temperature state "HOT"

telemetry/telemetry/page/cache_temperature_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 contextlib
 
 from telemetry import decorators
 from telemetry import page as page_module
 from telemetry import story
 from telemetry.page import cache_temperature
@@ skipping 32 matching lines @@
   def testEnsureAny(self):
     with self.captureTrace():
       story_set = story.StorySet()
       page = page_module.Page(
           'http://google.com', page_set=story_set,
           cache_temperature=cache_temperature.ANY, name='http://google.com')
       cache_temperature.EnsurePageCacheTemperature(page, self._browser)
 
     markers = self.traceMarkers()
     self.assertNotIn('telemetry.internal.ensure_diskcache.start', markers)
-    self.assertNotIn('telemetry.internal.warm_cache.start', markers)
+    self.assertTrue(
+        all('telemetry.internal.warm_cache' not in maker for maker in markers))

[kouhei (in TOK), 2017/09/26 04:40:52]

s/maker/marker/
why not assertNotIn?

[yukiy, 2017/09/26 05:23:32]

Because I added temperature for identifier in cache_temperature.py as: 
with MarkTelemetryInternal(browser, 'warm_cache.%s' % temperature):

I want to ensure that there are two "warm_cache" in |markers| at
testEnsureHotFromScratch(), but this |markers| is not a list but a set, so I
have to add some tags to check multiple "warm_cache".
Are there any other better ways?

 
   @decorators.Enabled('has tabs')
   @decorators.Disabled('chromeos')
   def testEnsureCold(self):
     with self.captureTrace():
       story_set = story.StorySet()
       page = page_module.Page(
           'http://google.com', page_set=story_set,
           cache_temperature=cache_temperature.COLD, name='http://google.com')
       cache_temperature.EnsurePageCacheTemperature(page, self._browser)
@@ skipping 12 matching lines @@
       cache_temperature.EnsurePageCacheTemperature(page, self._browser)
 
       previous_page = page
       page = page_module.Page(
           'http://google.com', page_set=story_set,
           cache_temperature=cache_temperature.WARM, name='http://google.com')
       cache_temperature.EnsurePageCacheTemperature(
           page, self._browser, previous_page)
 
     markers = self.traceMarkers()
-    self.assertNotIn('telemetry.internal.warm_cache.start', markers)
+    self.assertTrue(
+        all('telemetry.internal.warm_cache' not in maker for maker in markers))

[kouhei (in TOK), 2017/09/26 04:40:52]

ditto

 
   @decorators.Enabled('has tabs')
   @decorators.Disabled('chromeos')
   def testEnsureWarmFromScratch(self):
     with self.captureTrace():
       story_set = story.StorySet()
       page = page_module.Page(
           'http://google.com', page_set=story_set,
           cache_temperature=cache_temperature.WARM, name='http://google.com')
       cache_temperature.EnsurePageCacheTemperature(page, self._browser)
 
     markers = self.traceMarkers()
-    self.assertIn('telemetry.internal.warm_cache.start', markers)
-    self.assertIn('telemetry.internal.warm_cache.end', markers)
+    self.assertIn('telemetry.internal.warm_cache.warm.start', markers)
+    self.assertIn('telemetry.internal.warm_cache.warm.end', markers)
+
+  @decorators.Enabled('has tabs')
+  def testEnsureHotAfterColdAndWarmRun(self):
+    with self.captureTrace():
+      story_set = story.StorySet()
+      page = page_module.Page(
+          'http://google.com', page_set=story_set,
+          cache_temperature=cache_temperature.COLD, name='http://google.com')
+      cache_temperature.EnsurePageCacheTemperature(page, self._browser)
+
+      previous_page = page
+      page = page_module.Page(
+          'http://google.com', page_set=story_set,
+          cache_temperature=cache_temperature.WARM, name='http://google.com')
+      cache_temperature.EnsurePageCacheTemperature(
+          page, self._browser, previous_page)
+
+      previous_page = page
+      page = page_module.Page(
+          'http://google.com', page_set=story_set,
+          cache_temperature=cache_temperature.HOT, name='http://google.com')
+      cache_temperature.EnsurePageCacheTemperature(
+          page, self._browser, previous_page)
+
+    markers = self.traceMarkers()
+    self.assertTrue(
+        all('telemetry.internal.warm_cache' not in maker for maker in markers))

[kouhei (in TOK), 2017/09/26 04:40:52]

ditto

+
+  def testEnsureHotAfterColdRun(self):
+    with self.captureTrace():
+      story_set = story.StorySet()
+      page = page_module.Page(
+          'http://google.com', page_set=story_set,
+          cache_temperature=cache_temperature.COLD, name='http://google.com')
+      cache_temperature.EnsurePageCacheTemperature(page, self._browser)
+
+      previous_page = page
+      page = page_module.Page(
+          'http://google.com', page_set=story_set,
+          cache_temperature=cache_temperature.HOT, name='http://google.com')
+      cache_temperature.EnsurePageCacheTemperature(
+          page, self._browser, previous_page)
+
+    markers = self.traceMarkers()
+    # After navigation for another origin url, traces in previous origin page
+    # does not appear in |makers|, so we can not check this:
+    # self.assertIn('telemetry.internal.warm_cache.hot.start', markers)
+    # TODO: Ensure all traces are in |makers|
+    self.assertIn('telemetry.internal.warm_cache.hot.end', markers)
+
+  @decorators.Enabled('has tabs')
+  @decorators.Disabled('chromeos')
+  def testEnsureHotFromScratch(self):
+    with self.captureTrace():
+      story_set = story.StorySet()
+      page = page_module.Page(
+          'http://google.com', page_set=story_set,
+          cache_temperature=cache_temperature.HOT, name='http://google.com')
+      cache_temperature.EnsurePageCacheTemperature(page, self._browser)
+
+    markers = self.traceMarkers()
+    self.assertIn('telemetry.internal.warm_cache.warm.start', markers)
+    self.assertIn('telemetry.internal.warm_cache.warm.end', markers)
+    self.assertIn('telemetry.internal.warm_cache.hot.start', markers)
+    self.assertIn('telemetry.internal.warm_cache.hot.end', markers)