Move user_story.user_story_set to story.story_set

Move user_story.user_story_set to story.story_set

BUG=465594
CQ_EXTRA_TRYBOTS=tryserver.chromium.perf:linux_perf_bisect;tryserver.chromium.perf:mac_perf_bisect;tryserver.chromium.perf:android_nexus5_perf_bisect

Committed: https://crrev.com/527dccf6726d9b4cdbe36e031db819562f2c191e
Cr-Commit-Position: refs/heads/master@{#332823}

[aiolos (Not reviewing), 2015-05-02 01:12:44]

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

[aiolos (Not reviewing), 2015-05-02 01:14:05]

I should still go through and change all of the "uss" variables to something
more accurate and readable.

[aiolos (Not reviewing), 2015-05-02 02:03:26]

On 2015/05/02 01:14:05, aiolos wrote:
> I should still go through and change all of the "uss" variables to something
> more accurate and readable.

Rename done.

[nednguyen, 2015-05-04 00:46:11]

On 2015/05/02 02:03:26, aiolos wrote:
> On 2015/05/02 01:14:05, aiolos wrote:
> > I should still go through and change all of the "uss" variables to something
> > more accurate and readable.
> 
> Rename done.

How about add "from .story_set import StorySet" in story/__init__.py so the
client code can write:

from telemetry import story

class PageSet(story.StorySet)

[aiolos (Not reviewing), 2015-05-04 18:24:23]

On 2015/05/04 00:46:11, nednguyen (ooo til 05-07) wrote:
> On 2015/05/02 02:03:26, aiolos wrote:
> > On 2015/05/02 01:14:05, aiolos wrote:
> > > I should still go through and change all of the "uss" variables to
something
> > > more accurate and readable.
> > 
> > Rename done.
> 
> How about add "from .story_set import StorySet" in story/__init__.py so the
> client code can write:
> 
> from telemetry import story
> 
> class PageSet(story.StorySet)

Doesn't the style guide frown on importing classes instead of modules?

Should it instead be this:

from telemetry.story import story_set

StorySet = story_set.StorySet

[nednguyen, 2015-05-04 18:27:56]

On 2015/05/04 18:24:23, aiolos wrote:
> On 2015/05/04 00:46:11, nednguyen (ooo til 05-07) wrote:
> > On 2015/05/02 02:03:26, aiolos wrote:
> > > On 2015/05/02 01:14:05, aiolos wrote:
> > > > I should still go through and change all of the "uss" variables to
> something
> > > > more accurate and readable.
> > > 
> > > Rename done.
> > 
> > How about add "from .story_set import StorySet" in story/__init__.py so the
> > client code can write:
> > 
> > from telemetry import story
> > 
> > class PageSet(story.StorySet)
> 
> Doesn't the style guide frown on importing classes instead of modules?
> 
> Should it instead be this:
> 
> from telemetry.story import story_set
> 
> StorySet = story_set.StorySet

Although we could make an exception in this case, I think your workaround is
great too.

[aiolos (Not reviewing), 2015-05-04 18:35:47]

On 2015/05/04 18:27:56, nednguyen (ooo til 05-07) wrote:
> On 2015/05/04 18:24:23, aiolos wrote:
> > On 2015/05/04 00:46:11, nednguyen (ooo til 05-07) wrote:
> > > On 2015/05/02 02:03:26, aiolos wrote:
> > > > On 2015/05/02 01:14:05, aiolos wrote:
> > > > > I should still go through and change all of the "uss" variables to
> > something
> > > > > more accurate and readable.
> > > > 
> > > > Rename done.
> > > 
> > > How about add "from .story_set import StorySet" in story/__init__.py so
the
> > > client code can write:
> > > 
> > > from telemetry import story
> > > 
> > > class PageSet(story.StorySet)
> > 
> > Doesn't the style guide frown on importing classes instead of modules?
> > 
> > Should it instead be this:
> > 
> > from telemetry.story import story_set
> > 
> > StorySet = story_set.StorySet
> 
> Although we could make an exception in this case, I think your workaround is
> great too.

I don't mind it being an exception, but I do mind it being an undocumented one.

After office discussion, the current plan is to let __init__ files be an
exception to the "don't import classes directly" rule, and are starting a style
guide doc to keep track of how we clarify or deviate from the current style
guide.

[aiolos (Not reviewing), 2015-05-04 18:48:30]

On 2015/05/04 18:35:47, aiolos wrote:
> On 2015/05/04 18:27:56, nednguyen (ooo til 05-07) wrote:
> > On 2015/05/04 18:24:23, aiolos wrote:
> > > On 2015/05/04 00:46:11, nednguyen (ooo til 05-07) wrote:
> > > > On 2015/05/02 02:03:26, aiolos wrote:
> > > > > On 2015/05/02 01:14:05, aiolos wrote:
> > > > > > I should still go through and change all of the "uss" variables to
> > > something
> > > > > > more accurate and readable.
> > > > > 
> > > > > Rename done.
> > > > 
> > > > How about add "from .story_set import StorySet" in story/__init__.py so
> the
> > > > client code can write:
> > > > 
> > > > from telemetry import story
> > > > 
> > > > class PageSet(story.StorySet)
> > > 
> > > Doesn't the style guide frown on importing classes instead of modules?
> > > 
> > > Should it instead be this:
> > > 
> > > from telemetry.story import story_set
> > > 
> > > StorySet = story_set.StorySet
> > 
> > Although we could make an exception in this case, I think your workaround is
> > great too.
> 
> I don't mind it being an exception, but I do mind it being an undocumented
one.
> 
> After office discussion, the current plan is to let __init__ files be an
> exception to the "don't import classes directly" rule, and are starting a
style
> guide doc to keep track of how we clarify or deviate from the current style
> guide.

ptal. (I used absolute import path, which is consistent with the style guide.)

[nednguyen, 2015-05-04 23:30:24]

lgtm with nits

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
File tools/telemetry/telemetry/internal/story_runner_unittest.py (right):

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
tools/telemetry/telemetry/internal/story_runner_unittest.py:17: from
telemetry.story import story_set_module
Just use story or story_module is ok, I think

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
File tools/telemetry/telemetry/page/page_set.py (right):

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
tools/telemetry/telemetry/page/page_set.py:15: class
PageSet(story_set.StorySet):
story.StorySet?

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
File tools/telemetry/telemetry/page/shared_page_state_unittest.py (right):

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
tools/telemetry/telemetry/page/shared_page_state_unittest.py:14: from
telemetry.story import story_set_module
Same here

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
File tools/telemetry/telemetry/results/user_story_run_unittest.py (right):

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
tools/telemetry/telemetry/results/user_story_run_unittest.py:27: self.story_set
= story_set.StorySet()
... = story.StorySet()

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
File tools/telemetry/telemetry/story/shared_state.py (right):

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
tools/telemetry/telemetry/story/shared_state.py:20: story_set: a
story_set.StorySet instance.
a story.StorySet instance

[aiolos (Not reviewing), 2015-05-09 03:49:55]

Patchset #4 (id:60001) has been deleted

[aiolos (Not reviewing), 2015-05-09 03:53:59]

ptal. More changes were done than those asked for.

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
File tools/telemetry/telemetry/internal/story_runner_unittest.py (right):

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
tools/telemetry/telemetry/internal/story_runner_unittest.py:17: from
telemetry.story import story_set_module
On 2015/05/04 23:30:24, nednguyen wrote:
> Just use story or story_module is ok, I think

Done.

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
File tools/telemetry/telemetry/page/page_set.py (right):

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
tools/telemetry/telemetry/page/page_set.py:15: class
PageSet(story_set.StorySet):
On 2015/05/04 23:30:24, nednguyen wrote:
> story.StorySet?

Done.

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
File tools/telemetry/telemetry/page/shared_page_state_unittest.py (right):

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
tools/telemetry/telemetry/page/shared_page_state_unittest.py:14: from
telemetry.story import story_set_module
On 2015/05/04 23:30:24, nednguyen wrote:
> Same here

Done.

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
File tools/telemetry/telemetry/results/user_story_run_unittest.py (right):

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
tools/telemetry/telemetry/results/user_story_run_unittest.py:27: self.story_set
= story_set.StorySet()
On 2015/05/04 23:30:24, nednguyen wrote:
> ... = story.StorySet()

Done.

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
File tools/telemetry/telemetry/story/shared_state.py (right):

https://codereview.chromium.org/1126443002/diff/40001/tools/telemetry/telemet...
tools/telemetry/telemetry/story/shared_state.py:20: story_set: a
story_set.StorySet instance.
On 2015/05/04 23:30:24, nednguyen wrote:
> a story.StorySet instance

Done.

[nednguyen, 2015-05-12 15:39:49]

lgtm again

https://codereview.chromium.org/1126443002/diff/80001/tools/telemetry/telemet...
File tools/telemetry/telemetry/user_story/android/shared_app_state.py (right):

https://codereview.chromium.org/1126443002/diff/80001/tools/telemetry/telemet...
tools/telemetry/telemetry/user_story/android/shared_app_state.py:24: story_set:
an android.StorySet instance.
a story.StorySet instance

[aiolos (Not reviewing), 2015-05-12 20:45:32]

https://codereview.chromium.org/1126443002/diff/80001/tools/telemetry/telemet...
File tools/telemetry/telemetry/user_story/android/shared_app_state.py (right):

https://codereview.chromium.org/1126443002/diff/80001/tools/telemetry/telemet...
tools/telemetry/telemetry/user_story/android/shared_app_state.py:24: story_set:
an android.StorySet instance.
On 2015/05/12 15:39:49, nednguyen (slow review) wrote:
> a story.StorySet instance

This will fail during WillRunUserStory if a story.UserStory is passed in since
it doesn't have the attributes that we assume in this class. (start_intent for
example.)

[aiolos (Not reviewing), 2015-05-12 20:45:48]

The CQ bit was checked by aiolos@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-05-12 20:46:20]

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

[commit-bot: I haz the power, 2015-05-12 22:48:53]

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

[commit-bot: I haz the power, 2015-05-12 22:48:54]

Dry run: Try jobs failed on following builders:
  win_perf_bisect on tryserver.chromium.perf (JOB_TIMED_OUT, no build URL)

[aiolos (Not reviewing), 2015-05-13 04:34:40]

The CQ bit was checked by aiolos@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-05-13 04:34:46]

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

[commit-bot: I haz the power, 2015-05-13 12:03:47]

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

[commit-bot: I haz the power, 2015-05-13 12:03:49]

Dry run: Try jobs failed on following builders:
  win_perf_bisect on tryserver.chromium.perf (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.perf/builders/win_perf_bisect/...)

[nednguyen, 2015-05-13 20:15:36]

https://codereview.chromium.org/1126443002/diff/80001/tools/telemetry/telemet...
File tools/telemetry/telemetry/user_story/android/shared_app_state.py (right):

https://codereview.chromium.org/1126443002/diff/80001/tools/telemetry/telemet...
tools/telemetry/telemetry/user_story/android/shared_app_state.py:24: story_set:
an android.StorySet instance.
On 2015/05/12 20:45:32, aiolos (slow review) wrote:
> On 2015/05/12 15:39:49, nednguyen (slow review) wrote:
> > a story.StorySet instance
> 
> This will fail during WillRunUserStory if a story.UserStory is passed in since
> it doesn't have the attributes that we assume in this class. (start_intent for
> example.)

Ah, I forgot about this. Silly me, please ignore this comment.

[aiolos (Not reviewing), 2015-05-28 02:49:01]

Caught some story_sets that were misnamed us instead of uss. Do you want to take
another look?

[nednguyen, 2015-05-28 02:57:47]

On 2015/05/28 02:49:01, aiolos (slow review) wrote:
> Caught some story_sets that were misnamed us instead of uss. Do you want to
take
> another look?

You meant "us" instead of "story_set"?

lgtm

[aiolos (Not reviewing), 2015-05-28 17:03:07]

The CQ bit was checked by aiolos@chromium.org

[commit-bot: I haz the power, 2015-05-28 17:03:22]

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

[aiolos (Not reviewing), 2015-05-28 17:04:07]

On 2015/05/28 02:57:47, nednguyen wrote:
> On 2015/05/28 02:49:01, aiolos (slow review) wrote:
> > Caught some story_sets that were misnamed us instead of uss. Do you want to
> take
> > another look?
> 
> You meant "us" instead of "story_set"?
> 
> lgtm

From the old naming scheme, the user story sets were named uss, but these ones
left off the second s.

[commit-bot: I haz the power, 2015-05-28 18:51:39]

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

[commit-bot: I haz the power, 2015-05-28 18:51:40]

Try jobs failed on following builders:
  win_perf_bisect on tryserver.chromium.perf (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.perf/builders/win_perf_bisect/...)

[aiolos (Not reviewing), 2015-05-28 19:25:58]

The CQ bit was checked by aiolos@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-05-28 19:26:27]

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

[commit-bot: I haz the power, 2015-05-28 21:20:38]

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

[commit-bot: I haz the power, 2015-05-28 21:20:39]

Dry run: Try jobs failed on following builders:
  win_perf_bisect on tryserver.chromium.perf (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.perf/builders/win_perf_bisect/...)

[aiolos (Not reviewing), 2015-06-04 05:37:45]

The CQ bit was checked by aiolos@chromium.org

[aiolos (Not reviewing), 2015-06-04 05:37:45]

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/1126443002/#ps140001
(title: "rebase")

[commit-bot: I haz the power, 2015-06-04 05:38:01]

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

[commit-bot: I haz the power, 2015-06-04 09:36:53]

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

[commit-bot: I haz the power, 2015-06-04 09:36:54]

Try jobs failed on following builders:
  win_perf_bisect on tryserver.chromium.perf (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.perf/builders/win_perf_bisect/...)

[nednguyen, 2015-06-04 12:46:26]

The CQ bit was checked by nednguyen@google.com

[commit-bot: I haz the power, 2015-06-04 12:46:55]

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

[commit-bot: I haz the power, 2015-06-04 13:56:23]

Committed patchset #7 (id:140001)

[commit-bot: I haz the power, 2015-06-04 13:57:18]

Patchset 7 (id:??) landed as
https://crrev.com/527dccf6726d9b4cdbe36e031db819562f2c191e
Cr-Commit-Position: refs/heads/master@{#332823}