[telemetry] Fix testPageSetSmoke. The archive_data_file should be relative to the page set.

[telemetry] Fix testPageSetSmoke. The archive_data_file should be relative to the page set.

Also:
- Make it fatal if archive file is not on the filesystem.
- Remove broken archive file links.
- Move the test from test_utils/ to unittest/.


BUG=None.
TEST=content/test/gpu/run_unittests page_set && tools/perf/run_tests page_set

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=273890

[Ken Russell (switch to Gerrit), 2014-05-13 21:11:59]

Thanks for fixing this! LGTM

[nednguyen, 2014-05-15 01:47:26]

lgtm

I am happy if the bot is happy.

[nednguyen, 2014-05-15 03:02:24]

https://chromiumcodereview.appspot.com/286543004/diff/1/tools/telemetry/telem...
File tools/telemetry/telemetry/unittest/page_set_smoke_test.py (right):

https://chromiumcodereview.appspot.com/286543004/diff/1/tools/telemetry/telem...
tools/telemetry/telemetry/unittest/page_set_smoke_test.py:36:
os.path.dirname(os.path.realpath(page_set_path)),
Actually, I think this should be page_set.base_dir

[dtu, 2014-05-15 22:41:18]

https://codereview.chromium.org/286543004/diff/1/tools/telemetry/telemetry/un...
File tools/telemetry/telemetry/unittest/page_set_smoke_test.py (right):

https://codereview.chromium.org/286543004/diff/1/tools/telemetry/telemetry/un...
tools/telemetry/telemetry/unittest/page_set_smoke_test.py:36:
os.path.dirname(os.path.realpath(page_set_path)),
On 2014/05/15 03:02:24, nednguyen wrote:
> Actually, I think this should be page_set.base_dir

Done.

[dtu, 2014-05-15 22:41:23]

The CQ bit was checked by dtu@chromium.org

[commit-bot: I haz the power, 2014-05-15 22:42:58]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/dtu@chromium.org/286543004/20001

[commit-bot: I haz the power, 2014-05-16 01:47:21]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)
  win_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_rel/buil...)

[commit-bot: I haz the power, 2014-05-16 02:47:22]

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

[commit-bot: I haz the power, 2014-05-16 02:47:22]

Try jobs failed on following builders:
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)

[nednguyen, 2014-05-16 03:02:59]

The CQ bit was checked by nednguyen@google.com

[commit-bot: I haz the power, 2014-05-16 03:03:06]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/dtu@chromium.org/286543004/20001

[commit-bot: I haz the power, 2014-05-16 03:56:50]

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

[commit-bot: I haz the power, 2014-05-16 03:56:50]

Failed to apply patch for
@master/tools/telemetry/telemetry/unittest/page_set_smoke_test.py:
While running svn add @master --force --config-dir
/b/infra_internal/commit_queue/subversion_config --non-interactive;
  svn: '@master' is just a peg revision. Maybe try '@master@' instead?

Patch:   NR 
@master/tools/telemetry/telemetry/test_util/page_set_smoke_test.py->@master/t...
Index: tools/telemetry/telemetry/unittest/page_set_smoke_test.py
diff --git @master/tools/telemetry/telemetry/test_util/page_set_smoke_test.py
@master/tools/telemetry/telemetry/unittest/page_set_smoke_test.py
similarity index 69%
rename from @master/tools/telemetry/telemetry/test_util/page_set_smoke_test.py
rename to @master/tools/telemetry/telemetry/unittest/page_set_smoke_test.py
index
00d1a4bef05dab168680f57f34a6803c387f31fb..aa30415223b817c1e9baae8cfdefbd97c7cf6405
100644
--- a/@master/tools/telemetry/telemetry/test_util/page_set_smoke_test.py
+++ b/@master/tools/telemetry/telemetry/unittest/page_set_smoke_test.py
@@ -22,23 +22,23 @@ class PageSetSmokeTest(unittest.TestCase):
     # Instantiate all page sets and verify that all URLs have an associated
     # archive.
     page_sets = discover.GetAllPageSetFilenames(page_sets_dir)
-    for path in page_sets:
-      page_set = page_set_module.PageSet.FromFile(path)
+    for page_set_path in page_sets:
+      page_set = page_set_module.PageSet.FromFile(page_set_path)
 
       # TODO: Eventually these should be fatal.
       if not page_set.archive_data_file:
-        logging.warning('Skipping %s: missing archive data file', path)
-        continue
-      if not os.path.exists(os.path.join(page_sets_dir,
-                                         page_set.archive_data_file)):
-        logging.warning('Skipping %s: archive data file not found', path)
+        logging.warning('Skipping %s: no archive data file', page_set_path)
         continue
 
-      wpr_archive_info = page_set_archive_info.PageSetArchiveInfo.FromFile(
-        os.path.join(page_sets_dir, page_set.archive_data_file),
-        ignore_archive=True)
+      logging.info('Testing %s', page_set_path)
 
-      logging.info('Testing %s', path)
+      archive_data_file_path = os.path.join(page_set.base_dir,
+                                            page_set.archive_data_file)
+      self.assertTrue(os.path.exists(archive_data_file_path),
+                      msg='Archive data file not found for %s' % page_set_path)
+
+      wpr_archive_info = page_set_archive_info.PageSetArchiveInfo.FromFile(
+        archive_data_file_path, ignore_archive=True)
       for page in page_set.pages:
         if not page.url.startswith('http'):
           continue

[dtu, 2014-05-30 19:47:11]

The CQ bit was checked by dtu@chromium.org

[commit-bot: I haz the power, 2014-05-30 19:48:30]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/dtu@chromium.org/286543004/20001

[commit-bot: I haz the power, 2014-05-30 19:51:16]

Change committed as 273890