Move unittest_data to internal/testing.

Move unittest_data to internal/testing.

BUG=473414
Committed: https://crrev.com/09e65a1e1d0dea32c47bd24ae52a50b1965ff9e9
Cr-Commit-Position: refs/heads/master@{#337454}

[sullivan, 2015-07-01 16:29:44]

sullivan@chromium.org changed reviewers:
+ aiolos@chromium.org

[sullivan, 2015-07-01 16:29:45]

Some questions about this CL:

1) telemetry/internal/testing the right path?

2) bug id I should add?

3) story_runner_unittest fails with the following output, any ideas on how to
debug?

  Traceback (most recent call last):
    File
"/usr/local/google/code/chromium/src/tools/telemetry/telemetry/decorators.py",
line 118, in wrapper
      func(*args, **kwargs)
    File
"/usr/local/google/code/chromium/src/tools/telemetry/telemetry/internal/story_runner_unittest.py",
line 483, in testUpdateAndCheckArchives
      story_set.stories))
    File
"/usr/local/google/code/chromium/src/tools/telemetry/telemetry/internal/story_runner.py",
line 313, in _UpdateAndCheckArchives
      raise ArchiveError('Archive file is missing stories.')
  ArchiveError: Archive file is missing stories.

[sullivan, 2015-07-01 16:32:35]

https://codereview.chromium.org/1217293007/diff/1/tools/telemetry/telemetry/i...
File
tools/telemetry/telemetry/internal/testing/discoverable_classes/another_discover_dummyclass.py
(right):

https://codereview.chromium.org/1217293007/diff/1/tools/telemetry/telemetry/i...
tools/telemetry/telemetry/internal/testing/discoverable_classes/another_discover_dummyclass.py:33:
del parameter
I get the following presubmit errors, was the old-style class intentional?

************* Module
telemetry.internal.testing.discoverable_classes.another_discover_dummyclass
E: 16, 2: Use of super on an old style class (super-on-old-class)
E: 21, 2: Use of super on an old style class (super-on-old-class)
E: 26, 2: Use of super on an old style class (super-on-old-class)
E: 31, 2: Use of super on an old style class (super-on-old-class)

https://codereview.chromium.org/1217293007/diff/1/tools/telemetry/telemetry/i...
File
tools/telemetry/telemetry/internal/testing/discoverable_classes/parameter_discover_dummyclass.py
(right):

https://codereview.chromium.org/1217293007/diff/1/tools/telemetry/telemetry/i...
tools/telemetry/telemetry/internal/testing/discoverable_classes/parameter_discover_dummyclass.py:6:
from discoverable_classes import discover_dummyclass
This imports fine in the unit test but I get a presubmit error:

F:  6, 0: Unable to import 'discoverable_classes' (import-error)

Should I disable the pylint warning, or is there a different way I should write
this?

[aiolos (Not reviewing), 2015-07-01 17:45:38]

On 2015/07/01 16:29:45, sullivan wrote:
> Some questions about this CL:
> 
> 1) telemetry/internal/testing the right path?

Either that or unittest_data
> 
> 2) bug id I should add?

473414
> 
> 3) story_runner_unittest fails with the following output, any ideas on how to
> debug?
> 
>   Traceback (most recent call last):
>     File
> "/usr/local/google/code/chromium/src/tools/telemetry/telemetry/decorators.py",
> line 118, in wrapper
>       func(*args, **kwargs)
>     File
>
"/usr/local/google/code/chromium/src/tools/telemetry/telemetry/internal/story_runner_unittest.py",
> line 483, in testUpdateAndCheckArchives
>       story_set.stories))
>     File
>
"/usr/local/google/code/chromium/src/tools/telemetry/telemetry/internal/story_runner.py",
> line 313, in _UpdateAndCheckArchives
>       raise ArchiveError('Archive file is missing stories.')
>   ArchiveError: Archive file is missing stories.

update the following line (476 in my version) in story_runner_unittest.py to
reflect the new location
archive_data_file='../../unittest_data/archive_files/test.json',

[sullivan, 2015-07-01 17:51:42]

On 2015/07/01 17:45:38, aiolos wrote:
> On 2015/07/01 16:29:45, sullivan wrote:
> > Some questions about this CL:
> > 
> > 1) telemetry/internal/testing the right path?
> 
> Either that or unittest_data

I'll keep it in testing if that's an okay path.

> > 2) bug id I should add?
> 
> 473414

Done.

> > 3) story_runner_unittest fails with the following output, any ideas on how
to
> > debug?
> > 
> >   Traceback (most recent call last):
> >     File
> >
"/usr/local/google/code/chromium/src/tools/telemetry/telemetry/decorators.py",
> > line 118, in wrapper
> >       func(*args, **kwargs)
> >     File
> >
>
"/usr/local/google/code/chromium/src/tools/telemetry/telemetry/internal/story_runner_unittest.py",
> > line 483, in testUpdateAndCheckArchives
> >       story_set.stories))
> >     File
> >
>
"/usr/local/google/code/chromium/src/tools/telemetry/telemetry/internal/story_runner.py",
> > line 313, in _UpdateAndCheckArchives
> >       raise ArchiveError('Archive file is missing stories.')
> >   ArchiveError: Archive file is missing stories.
> 
> update the following line (476 in my version) in story_runner_unittest.py to
> reflect the new location
> archive_data_file='../../unittest_data/archive_files/test.json',

I did update the path in my CL, I'm not sure how to debug further. More comments
inline in story_runner_unittest.

[aiolos (Not reviewing), 2015-07-01 17:54:34]

https://codereview.chromium.org/1217293007/diff/1/tools/telemetry/telemetry/i...
File
tools/telemetry/telemetry/internal/testing/discoverable_classes/another_discover_dummyclass.py
(right):

https://codereview.chromium.org/1217293007/diff/1/tools/telemetry/telemetry/i...
tools/telemetry/telemetry/internal/testing/discoverable_classes/another_discover_dummyclass.py:33:
del parameter
On 2015/07/01 16:32:35, sullivan wrote:
> I get the following presubmit errors, was the old-style class intentional?
> 
> ************* Module
> telemetry.internal.testing.discoverable_classes.another_discover_dummyclass
> E: 16, 2: Use of super on an old style class (super-on-old-class)
> E: 21, 2: Use of super on an old style class (super-on-old-class)
> E: 26, 2: Use of super on an old style class (super-on-old-class)
> E: 31, 2: Use of super on an old style class (super-on-old-class)

No, it's not intentional. And is likely caused because the discover_dummyclass
wasn't found, not because these are actually old style classes. Try removing the
pylint disable and see if it's correctly importing. You probably need the full
path. (telemetry.internal.testing.discoverable_classes)

https://codereview.chromium.org/1217293007/diff/1/tools/telemetry/telemetry/i...
File
tools/telemetry/telemetry/internal/testing/discoverable_classes/parameter_discover_dummyclass.py
(right):

https://codereview.chromium.org/1217293007/diff/1/tools/telemetry/telemetry/i...
tools/telemetry/telemetry/internal/testing/discoverable_classes/parameter_discover_dummyclass.py:6:
from discoverable_classes import discover_dummyclass
On 2015/07/01 16:32:35, sullivan wrote:
> This imports fine in the unit test but I get a presubmit error:
> 
> F:  6, 0: Unable to import 'discoverable_classes' (import-error)
> 
> Should I disable the pylint warning, or is there a different way I should
write
> this?

try giving it the full path as well.

[aiolos (Not reviewing), 2015-07-01 18:02:11]

https://codereview.chromium.org/1217293007/diff/1/tools/telemetry/telemetry/i...
File tools/telemetry/telemetry/internal/story_runner_unittest.py (right):

https://codereview.chromium.org/1217293007/diff/1/tools/telemetry/telemetry/i...
tools/telemetry/telemetry/internal/story_runner_unittest.py:476:
archive_data_file='internal/testing/archive_files/test.json',
story_runner_unittest is already in internal, so this path is looking in
internal/internal, which doesn't exist.
I'd actually suggest using GetTelemetryDir from core.util, and joining that to
the current path you have that way we won't break this if the unittest gets
moved.

[sullivan, 2015-07-01 18:44:04]

On 2015/07/01 18:02:11, aiolos wrote:
>
https://codereview.chromium.org/1217293007/diff/1/tools/telemetry/telemetry/i...
> File tools/telemetry/telemetry/internal/story_runner_unittest.py (right):
> 
>
https://codereview.chromium.org/1217293007/diff/1/tools/telemetry/telemetry/i...
> tools/telemetry/telemetry/internal/story_runner_unittest.py:476:
> archive_data_file='internal/testing/archive_files/test.json',
> story_runner_unittest is already in internal, so this path is looking in
> internal/internal, which doesn't exist.
> I'd actually suggest using GetTelemetryDir from core.util, and joining that to
> the current path you have that way we won't break this if the unittest gets
> moved.

Thanks for all your help with this! Updated the tests and fixed the presubmit.
This is ready for review.

[sullivan, 2015-07-01 18:44:22]

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

[commit-bot: I haz the power, 2015-07-01 18:46:31]

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

[commit-bot: I haz the power, 2015-07-01 19:57:59]

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

[commit-bot: I haz the power, 2015-07-01 19:58:00]

Dry run: This issue passed the CQ dry run.

[sullivan, 2015-07-06 18:26:56]

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

[commit-bot: I haz the power, 2015-07-06 18:30:15]

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

[commit-bot: I haz the power, 2015-07-06 19:43:01]

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

[commit-bot: I haz the power, 2015-07-06 19:43:02]

Dry run: This issue passed the CQ dry run.

[aiolos (Not reviewing), 2015-07-06 19:44:38]

On 2015/07/06 19:43:02, commit-bot: I haz the power wrote:
> Dry run: This issue passed the CQ dry run.

lgtm.

[sullivan, 2015-07-06 19:45:18]

The CQ bit was checked by sullivan@chromium.org

[commit-bot: I haz the power, 2015-07-06 19:47:47]

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

[commit-bot: I haz the power, 2015-07-06 19:55:30]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-07-06 19:56:55]

Patchset 3 (id:??) landed as
https://crrev.com/09e65a1e1d0dea32c47bd24ae52a50b1965ff9e9
Cr-Commit-Position: refs/heads/master@{#337454}