Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1009)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/telemetry/telemetry/user_story/user_story_runner_unittest.py

Issue 725133005: Move serving_dirs to UserStorySet, update user_story_runner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comment. Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/telemetry/telemetry/user_story/user_story_runner.py ('k') | tools/telemetry/telemetry/user_story/user_story_set.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/user_story/user_story_runner_unittest.py
diff --git a/tools/telemetry/telemetry/user_story/user_story_runner_unittest.py b/tools/telemetry/telemetry/user_story/user_story_runner_unittest.py
index a99a4b978e822dfa742b1d4c763158ba09ab7841..44af774ed571c5bbf6dfacc06ecfc3556e4e0d45 100644
--- a/tools/telemetry/telemetry/user_story/user_story_runner_unittest.py
+++ b/tools/telemetry/telemetry/user_story/user_story_runner_unittest.py
@@ -9,7 +9,7 @@ import sys
from telemetry import benchmark
from telemetry import user_story
from telemetry.core import exceptions
-from telemetry.page import page_set
+from telemetry.page import page as page_module
from telemetry.page import page_test
from telemetry.page import test_expectations
from telemetry.results import results_options
@@ -19,6 +19,7 @@ from telemetry.unittest_util import system_stub
from telemetry.user_story import shared_user_story_state
from telemetry.user_story import user_story_runner
from telemetry.user_story import user_story_set
+from telemetry.util import cloud_storage
from telemetry.util import exception_formatter as exception_formatter_module
from telemetry.value import scalar
from telemetry.value import string
@@ -88,6 +89,15 @@ class EmptyMetadataForTest(benchmark.BenchmarkMetadata):
super(EmptyMetadataForTest, self).__init__('')
+class DummyLocalUserStory(user_story.UserStory):
+ def __init__(self, shared_user_story_state_class, name=''):
+ super(DummyLocalUserStory, self).__init__(
+ shared_user_story_state_class, name=name)
+
+ @property
+ def is_local(self):
+ return True
+
def _GetOptionForUnittest():
options = options_for_unittests.GetCopy()
options.output_formats = ['none']
@@ -136,10 +146,10 @@ class UserStoryRunnerTest(unittest.TestCase):
def testGetUserStoryGroupsWithSameSharedUserStoryClass(self):
us = user_story_set.UserStorySet()
- us.AddUserStory(user_story.UserStory(FooUserStoryState))
- us.AddUserStory(user_story.UserStory(FooUserStoryState))
- us.AddUserStory(user_story.UserStory(BarUserStoryState))
- us.AddUserStory(user_story.UserStory(FooUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(FooUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(FooUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(BarUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(FooUserStoryState))
story_groups = (
user_story_runner.GetUserStoryGroupsWithSameSharedUserStoryClass(
us))
@@ -153,9 +163,9 @@ class UserStoryRunnerTest(unittest.TestCase):
def testSuccefulUserStoryTest(self):
us = user_story_set.UserStorySet()
- us.AddUserStory(user_story.UserStory(FooUserStoryState))
- us.AddUserStory(user_story.UserStory(FooUserStoryState))
- us.AddUserStory(user_story.UserStory(BarUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(FooUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(FooUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(BarUserStoryState))
user_story_runner.Run(
DummyTest(), us, self.expectations, self.options, self.results)
self.assertEquals(0, len(self.results.failures))
@@ -184,10 +194,10 @@ class UserStoryRunnerTest(unittest.TestCase):
def TearDownState(self, _results):
barz_tear_down_call_counter[0] += 1
- us.AddUserStory(user_story.UserStory(FoozUserStoryState))
- us.AddUserStory(user_story.UserStory(FoozUserStoryState))
- us.AddUserStory(user_story.UserStory(BarzUserStoryState))
- us.AddUserStory(user_story.UserStory(BarzUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(FoozUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(FoozUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(BarzUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(BarzUserStoryState))
user_story_runner.Run(
DummyTest(), us, self.expectations, self.options, self.results)
self.assertEquals(0, len(self.results.failures))
@@ -204,7 +214,7 @@ class UserStoryRunnerTest(unittest.TestCase):
def WillRunUserStory(self, user_storyz):
raise exceptions.AppCrashException()
- us.AddUserStory(user_story.UserStory(SharedUserStoryThatCausesAppCrash))
+ us.AddUserStory(DummyLocalUserStory(SharedUserStoryThatCausesAppCrash))
user_story_runner.Run(
DummyTest(), us, self.expectations, self.options, self.results)
self.assertEquals(1, len(self.results.failures))
@@ -231,8 +241,8 @@ class UserStoryRunnerTest(unittest.TestCase):
def ValidateAndMeasurePage(self, page, tab, results):
pass
- us.AddUserStory(user_story.UserStory(TestSharedUserStoryState))
- us.AddUserStory(user_story.UserStory(TestSharedUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(TestSharedUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(TestSharedUserStoryState))
test = Test()
user_story_runner.Run(
test, us, self.expectations, self.options, self.results)
@@ -258,8 +268,8 @@ class UserStoryRunnerTest(unittest.TestCase):
def ValidateAndMeasurePage(self, page, tab, results):
pass
- us.AddUserStory(user_story.UserStory(TestSharedUserStoryState))
- us.AddUserStory(user_story.UserStory(TestSharedUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(TestSharedUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(TestSharedUserStoryState))
test = Test()
user_story_runner.Run(
test, us, self.expectations, self.options, self.results)
@@ -269,8 +279,8 @@ class UserStoryRunnerTest(unittest.TestCase):
def testDiscardFirstResult(self):
us = user_story_set.UserStorySet()
- us.AddUserStory(user_story.UserStory(TestSharedUserStoryState))
- us.AddUserStory(user_story.UserStory(TestSharedUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(TestSharedUserStoryState))
+ us.AddUserStory(DummyLocalUserStory(TestSharedUserStoryState))
class Measurement(page_test.PageTest):
@property
def discard_first_result(self):
@@ -324,9 +334,9 @@ class UserStoryRunnerTest(unittest.TestCase):
def testPagesetRepeat(self):
us = user_story_set.UserStorySet()
- us.AddUserStory(user_story.UserStory(
+ us.AddUserStory(DummyLocalUserStory(
TestSharedUserStoryState, name='blank'))
- us.AddUserStory(user_story.UserStory(
+ us.AddUserStory(DummyLocalUserStory(
TestSharedUserStoryState, name='green'))
class Measurement(page_test.PageTest):
@@ -361,35 +371,43 @@ class UserStoryRunnerTest(unittest.TestCase):
sys.stdout = real_stdout
def testCheckArchives(self):
- ps = page_set.PageSet()
- ps.AddPageWithDefaultRunNavigate('http://www.testurl.com')
+ uss = user_story_set.UserStorySet()
+ uss.AddUserStory(page_module.Page(
+ 'http://www.testurl.com', self, uss.base_dir))
# Page set missing archive_data_file.
self.assertFalse(user_story_runner._CheckArchives(
- ps.archive_data_file, ps.wpr_archive_info, ps.pages))
+ uss.archive_data_file, uss.wpr_archive_info, uss.user_stories))
- ps = page_set.PageSet(archive_data_file='missing_archive_data_file.json')
- ps.AddPageWithDefaultRunNavigate('http://www.testurl.com')
+ uss = user_story_set.UserStorySet(
+ archive_data_file='missing_archive_data_file.json')
+ uss.AddUserStory(page_module.Page(
+ 'http://www.testurl.com', self, uss.base_dir))
# Page set missing json file specified in archive_data_file.
self.assertFalse(user_story_runner._CheckArchives(
- ps.archive_data_file, ps.wpr_archive_info, ps.pages))
+ uss.archive_data_file, uss.wpr_archive_info, uss.user_stories))
- ps = page_set.PageSet(archive_data_file='../../unittest_data/test.json',
- bucket=page_set.PUBLIC_BUCKET)
- ps.AddPageWithDefaultRunNavigate('http://www.testurl.com')
+ uss = user_story_set.UserStorySet(
+ archive_data_file='../../unittest_data/test.json',
+ cloud_storage_bucket=cloud_storage.PUBLIC_BUCKET)
+ uss.AddUserStory(page_module.Page(
+ 'http://www.testurl.com', self, uss.base_dir))
# Page set with valid archive_data_file.
self.assertTrue(user_story_runner._CheckArchives(
- ps.archive_data_file, ps.wpr_archive_info, ps.pages))
- ps.AddPageWithDefaultRunNavigate('http://www.google.com')
+ uss.archive_data_file, uss.wpr_archive_info, uss.user_stories))
+ uss.AddUserStory(page_module.Page(
+ 'http://www.google.com', self, uss.base_dir))
# Page set with an archive_data_file which exists but is missing a page.
self.assertFalse(user_story_runner._CheckArchives(
- ps.archive_data_file, ps.wpr_archive_info, ps.pages))
+ uss.archive_data_file, uss.wpr_archive_info, uss.user_stories))
- ps = page_set.PageSet(
+ uss = user_story_set.UserStorySet(
archive_data_file='../../unittest_data/test_missing_wpr_file.json',
- bucket=page_set.PUBLIC_BUCKET)
- ps.AddPageWithDefaultRunNavigate('http://www.testurl.com')
- ps.AddPageWithDefaultRunNavigate('http://www.google.com')
+ cloud_storage_bucket=cloud_storage.PUBLIC_BUCKET)
+ uss.AddUserStory(page_module.Page(
+ 'http://www.testurl.com', self, uss.base_dir))
+ uss.AddUserStory(page_module.Page(
+ 'http://www.google.com', self, uss.base_dir))
# Page set with an archive_data_file which exists and contains all pages
# but fails to find a wpr file.
self.assertFalse(user_story_runner._CheckArchives(
- ps.archive_data_file, ps.wpr_archive_info, ps.pages))
+ uss.archive_data_file, uss.wpr_archive_info, uss.user_stories))
« no previous file with comments | « tools/telemetry/telemetry/user_story/user_story_runner.py ('k') | tools/telemetry/telemetry/user_story/user_story_set.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698