Refactor serving_dirs.

tools/telemetry/telemetry/page/page_set_unittest.py

Index: tools/telemetry/telemetry/page/page_set_unittest.py
diff --git a/tools/telemetry/telemetry/page/page_set_unittest.py b/tools/telemetry/telemetry/page/page_set_unittest.py
index 22c690d8b1786daefe5b387fdca73add5ccc837a..335d75b819a9f57463032c5fd9de2f2d66fe2e76 100644
--- a/tools/telemetry/telemetry/page/page_set_unittest.py
+++ b/tools/telemetry/telemetry/page/page_set_unittest.py
@@ -24,7 +24,9 @@ class TestPageSet(unittest.TestCase):
       os.rmdir(directory_path)
 
     real_directory_path = os.path.realpath(directory_path)
-    expected_serving_dirs = set([os.path.join(real_directory_path, 'a', 'b')])
+    expected_serving_dirs = set([os.path.join(real_directory_path, 'a', 'b'),
+                                 os.path.join(real_directory_path, 'c'),
+                                 os.path.join(real_directory_path, 'd')])

[nednguyen, 2015/02/03 01:37:37]

How does this change happen and is it correct?

[aiolos (Not reviewing), 2015/02/03 02:35:36]

The change happens because I changed user_story_set to return a list of it's
serving_dirs and it's page's serving dirs. The only places we need the serving
dir, we have also needed to iterate over the pages in the pageset to add their
serving dirs. I changed the logic to include the serving_dirs of it's
user_stories as well, and thus needed to change the test.

     self.assertEquals(ps.serving_dirs, expected_serving_dirs)
     self.assertEquals(ps[0].serving_dir, os.path.join(real_directory_path, 'c'))
     self.assertEquals(ps[2].serving_dir, os.path.join(real_directory_path, 'd'))