Migrate PageSets to StorySets in buildbot page sets

Migrate PageSets to StorySets in buildbot page sets

BUG=skia:3967
NOTRY=true
TBR=

Committed: https://skia.googlesource.com/skia/+/dd3b12e270ada5cc207c54d0d26c7a7c3d0e123e

[rmistry, 2015-06-22 16:56:20]

rmistry@google.com changed reviewers:
+ nednguyen@google.com

[rmistry, 2015-06-22 16:56:21]

Also, I am assuming that if this lands then it will fail until an upstream
change in
https://codereview.chromium.org/1198823004/diff/20001/tools/telemetry/telemet...
lands first.

[nednguyen, 2015-06-22 21:12:44]

nednguyen@google.com changed reviewers:
+ aiolos@chromium.org

[nednguyen, 2015-06-22 21:14:37]

On 2015/06/22 21:12:45, nednguyen (ooo til 06-22) wrote:

lgtm

If you use "CreateStorySet" method in your benchmarks, you shouldn't need to
worry about it. 
https://code.google.com/p/chromium/codesearch#chromium/src/tools/telemetry/te...

We will also switch the benchmarks in perf/ to use CreateStorySet method.

[rmistry, 2015-06-23 11:00:23]

On 2015/06/22 21:14:37, nednguyen (ooo til 06-22) wrote:
> On 2015/06/22 21:12:45, nednguyen (ooo til 06-22) wrote:
> 
> lgtm
> 
> If you use "CreateStorySet" method in your benchmarks, you shouldn't need to
> worry about it. 
>
https://code.google.com/p/chromium/codesearch#chromium/src/tools/telemetry/te...
> 
> We will also switch the benchmarks in perf/ to use CreateStorySet method.

SG. Please cc me on that CL (if you remember to, not a big deal otherwise).
Thanks!

[rmistry, 2015-06-30 10:21:40]

On 2015/06/23 11:00:23, rmistry wrote:
> On 2015/06/22 21:14:37, nednguyen (ooo til 06-22) wrote:
> > On 2015/06/22 21:12:45, nednguyen (ooo til 06-22) wrote:
> > 
> > lgtm
> > 
> > If you use "CreateStorySet" method in your benchmarks, you shouldn't need to
> > worry about it. 
> >
>
https://code.google.com/p/chromium/codesearch#chromium/src/tools/telemetry/te...
> > 
> > We will also switch the benchmarks in perf/ to use CreateStorySet method.
> 
> SG. Please cc me on that CL (if you remember to, not a big deal otherwise).
> Thanks!

Now that https://codereview.chromium.org/1217813005/ ('Modify CreatePageSet to
CreateStorySet') has landed I am going to land this and see if our bot succeeds.

[rmistry, 2015-06-30 10:21:46]

The CQ bit was checked by rmistry@google.com

[rmistry, 2015-06-30 10:21:50]

The CQ bit was unchecked by rmistry@google.com

[rmistry, 2015-06-30 10:21:56]

The CQ bit was checked by rmistry@google.com

[commit-bot: I haz the power, 2015-06-30 10:22:10]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1203433002/1

[commit-bot: I haz the power, 2015-06-30 10:22:11]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2015-06-30 16:22 UTC

[commit-bot: I haz the power, 2015-06-30 10:23:20]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-30 10:23:21]

Try jobs failed on following builders:
  skia_presubmit-Trybot on client.skia.fyi (JOB_FAILED,
http://build.chromium.org/p/client.skia.fyi/builders/skia_presubmit-Trybot/bu...)

[rmistry, 2015-06-30 10:27:43]

The CQ bit was checked by rmistry@google.com to run a CQ dry run

[rmistry, 2015-06-30 10:27:44]

The patchset sent to the CQ was uploaded after l-g-t-m from nednguyen@google.com
Link to the patchset: https://codereview.chromium.org/1203433002/#ps20001
(title: "Fix typo")

[commit-bot: I haz the power, 2015-06-30 10:27:48]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1203433002/20001

[commit-bot: I haz the power, 2015-06-30 10:28:13]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-30 10:28:14]

Dry run: This issue passed the CQ dry run.

[rmistry, 2015-06-30 10:28:45]

The CQ bit was checked by rmistry@google.com

[commit-bot: I haz the power, 2015-06-30 10:29:00]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1203433002/20001

[rmistry, 2015-06-30 10:53:00]

The CQ bit was unchecked by rmistry@google.com

[rmistry, 2015-06-30 10:53:11]

The CQ bit was checked by rmistry@google.com

[commit-bot: I haz the power, 2015-06-30 10:53:20]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1203433002/20001

[commit-bot: I haz the power, 2015-06-30 10:54:12]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/dd3b12e270ada5cc207c54d0d26c7a7c3d0e123e

[rmistry, 2015-06-30 11:52:49]

On 2015/06/30 10:54:12, commit-bot: I haz the power wrote:
> Committed patchset #2 (id:20001) as
> https://skia.googlesource.com/skia/+/dd3b12e270ada5cc207c54d0d26c7a7c3d0e123e

Ned, this caused the following failure in our bots:

[11:18:42.433592] [11:18:41.961316] Traceback (most recent call last):
[11:18:42.433611] [11:18:41.961353]   <module> at tools/perf/run_benchmark:20
[11:18:42.433628] [11:18:41.961412]     sys.exit(benchmark_runner.main(config))
[11:18:42.433661] [11:18:41.961452]   main at
tools/telemetry/telemetry/benchmark_runner.py:438
[11:18:42.433679] [11:18:41.961471]     return command().Run(options)
[11:18:42.433696] [11:18:41.961496]   Run at
tools/telemetry/telemetry/benchmark_runner.py:270
[11:18:42.433714] [11:18:41.961516]     return min(255,
self._benchmark().Run(args))
[11:18:42.433731] [11:18:41.961550]   Run at
tools/telemetry/telemetry/benchmark.py:180
[11:18:42.433748] [11:18:41.961569]     stories =
self.CreateStorySet(finder_options)
[11:18:42.433764] [11:18:41.961594]   CreateStorySet at
tools/perf/benchmarks/skpicture_printer.py:52
[11:18:42.433781] [11:18:41.961627]     return page_set_class()
[11:18:42.433799] [11:18:41.961652] TypeError: 'NoneType' object is not callable



This is how I fixed it:


-from telemetry import story
 from telemetry.page import page as page_module
+from telemetry.page import page_set as page_set_module
 from telemetry.page import shared_page_state
 
 
@@ -20,7 +21,7 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     self.archive_data_file = 'data/skia_carsvg_desktop.json'
 
 
-class SkiaCarsvgDesktopPageSet(story.StorySet):
+class SkiaCarsvgDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """



I thought using story.StorySet was the right way of doing things. What am I
missing?

[nednguyen, 2015-06-30 13:37:21]

On 2015/06/30 11:52:49, rmistry wrote:
> On 2015/06/30 10:54:12, commit-bot: I haz the power wrote:
> > Committed patchset #2 (id:20001) as
> >
https://skia.googlesource.com/skia/+/dd3b12e270ada5cc207c54d0d26c7a7c3d0e123e
> 
> Ned, this caused the following failure in our bots:
> 
> [11:18:42.433592] [11:18:41.961316] Traceback (most recent call last):
> [11:18:42.433611] [11:18:41.961353]   <module> at tools/perf/run_benchmark:20
> [11:18:42.433628] [11:18:41.961412]    
sys.exit(benchmark_runner.main(config))
> [11:18:42.433661] [11:18:41.961452]   main at
> tools/telemetry/telemetry/benchmark_runner.py:438
> [11:18:42.433679] [11:18:41.961471]     return command().Run(options)
> [11:18:42.433696] [11:18:41.961496]   Run at
> tools/telemetry/telemetry/benchmark_runner.py:270
> [11:18:42.433714] [11:18:41.961516]     return min(255,
> self._benchmark().Run(args))
> [11:18:42.433731] [11:18:41.961550]   Run at
> tools/telemetry/telemetry/benchmark.py:180
> [11:18:42.433748] [11:18:41.961569]     stories =
> self.CreateStorySet(finder_options)
> [11:18:42.433764] [11:18:41.961594]   CreateStorySet at
> tools/perf/benchmarks/skpicture_printer.py:52
> [11:18:42.433781] [11:18:41.961627]     return page_set_class()
> [11:18:42.433799] [11:18:41.961652] TypeError: 'NoneType' object is not
callable
> 
> 
> 
> This is how I fixed it:
> 
> 
> -from telemetry import story
>  from telemetry.page import page as page_module
> +from telemetry.page import page_set as page_set_module
>  from telemetry.page import shared_page_state
>  
>  
> @@ -20,7 +21,7 @@ class SkiaBuildbotDesktopPage(page_module.Page):
>      self.archive_data_file = 'data/skia_carsvg_desktop.json'
>  
>  
> -class SkiaCarsvgDesktopPageSet(story.StorySet):
> +class SkiaCarsvgDesktopPageSet(page_set_module.PageSet):
>  
>    """ Pages designed to represent the median, not highly optimized web """
> 
> 
> 
> I thought using story.StorySet was the right way of doing things. What am I
> missing?

Hmh, skpicture_printer benchmark is doing some weird logic to discover page_set.
I will make update it.