Add cache_temperature state "HOT"

telemetry/telemetry/page/cache_temperature_unittest.py

Index: telemetry/telemetry/page/cache_temperature_unittest.py
diff --git a/telemetry/telemetry/page/cache_temperature_unittest.py b/telemetry/telemetry/page/cache_temperature_unittest.py
index ae73bbd779b250f8bad3c08615e0cb4df9436d26..056fb3982435049b7134c02c1f88aea393207617 100644
--- a/telemetry/telemetry/page/cache_temperature_unittest.py
+++ b/telemetry/telemetry/page/cache_temperature_unittest.py
@@ -50,7 +50,8 @@ class CacheTempeartureTests(browser_test_case.BrowserTestCase):
 
     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')
@@ -83,7 +84,8 @@ class CacheTempeartureTests(browser_test_case.BrowserTestCase):
           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')
@@ -96,5 +98,70 @@ class CacheTempeartureTests(browser_test_case.BrowserTestCase):
       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)