Defining the test expectations object

tools/telemetry/telemetry/page/page_set.py

Index: tools/telemetry/telemetry/page/page_set.py
diff --git a/tools/telemetry/telemetry/page/page_set.py b/tools/telemetry/telemetry/page/page_set.py
index 935cafec315505e46e383762c0243898fa1ccc90..de8ad7cdd5aa378e3c5d373813fb9be60e4cc74f 100644
--- a/tools/telemetry/telemetry/page/page_set.py
+++ b/tools/telemetry/telemetry/page/page_set.py
@@ -8,6 +8,7 @@ import urlparse
 
 from telemetry.page import page as page_module
 from telemetry.page import page_set_archive_info
+from telemetry.page import page_set_expectations
 
 class PageSet(object):
   def __init__(self, file_path='', attributes=None):
@@ -17,6 +18,7 @@ class PageSet(object):
     self.credentials_path = None
     self.user_agent_type = None
     self.make_javascript_deterministic = True
+    self.expectations = page_set_expectations.PageSetExpectations()
 
     if attributes:
       for k, v in attributes.iteritems():
@@ -48,8 +50,17 @@ class PageSet(object):
       base_dir = file_path
     else:
       base_dir = os.path.dirname(file_path)
+
     for page_attributes in data['pages']:
       url = page_attributes.pop('url')
+
+      if 'expectations' in page_attributes:

[dtu, 2013/07/16 09:50:49]

For now I'm gonna say don't allow setting expectations in the page set. You run
the risk of disabling pages in benchmarks that you didn't intend do, since more
and more of them are using the same page sets.

+        expectation_list = page_attributes.pop('expectations')
+        for expectation in expectation_list:
+          test_expectation = page_set_expectations.TestExpectation.FromDict(url,
+            expectation)
+          page_set.expectations.AddExpectation(test_expectation)
+
       page = page_module.Page(url, page_set, attributes=page_attributes,
                               base_dir=base_dir)
       page_set.pages.append(page)