tools/telemetry/telemetry/user_story/user_story_runner_unittest.py - Issue 725133005: Move serving_dirs to UserStorySet, update user_story_runner.

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: 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

« tools/telemetry/telemetry/user_story/user_story_runner.py ('K') | « 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') | 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 e4049a767e7e27018f0df183b83dab90261a6683..b0b60aeea0a618983d0170829273e8479ee42785 100644

--- a/tools/telemetry/telemetry/user_story/user_story_runner_unittest.py

+++ b/tools/telemetry/telemetry/user_story/user_story_runner_unittest.py

@@ -85,6 +85,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']

@@ -133,10 +142,10 @@ class UserStoryRunnerTest(unittest.TestCase):

def testGetUserStoryGroupsWithSameSharedUserStoryClass(self):

us = user_story_set.UserStorySet()

- 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(BarUserStoryState))

+ us.AddUserStory(DummyLocalUserStory(FooUserStoryState))

story_groups = (

user_story_runner.GetUserStoryGroupsWithSameSharedUserStoryClass(

us))

@@ -150,9 +159,9 @@ class UserStoryRunnerTest(unittest.TestCase):

def testSuccefulUserStoryTest(self):

us = user_story_set.UserStorySet()

- us.AddUserStory(user_story.UserStory(FooUserStoryState))

- us.AddUserStory(user_story.UserStory(BarUserStoryState))

+ 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))

@@ -181,10 +190,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(BarzUserStoryState))

+ us.AddUserStory(DummyLocalUserStory(FoozUserStoryState))

+ us.AddUserStory(DummyLocalUserStory(BarzUserStoryState))

user_story_runner.Run(

DummyTest(), us, self.expectations, self.options, self.results)

self.assertEquals(0, len(self.results.failures))

@@ -201,7 +210,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))

@@ -224,8 +233,8 @@ class UserStoryRunnerTest(unittest.TestCase):

if old_run_count == 0:

raise ExpectedException()

- us.AddUserStory(user_story.UserStory(TestSharedUserStoryState))

+ us.AddUserStory(DummyLocalUserStory(TestSharedUserStoryState))

test = Test()

user_story_runner.Run(

test, us, self.expectations, self.options, self.results)

@@ -247,8 +256,8 @@ class UserStoryRunnerTest(unittest.TestCase):

if old_run_count == 0:

raise exceptions.BrowserGoneException()

- us.AddUserStory(user_story.UserStory(TestSharedUserStoryState))

+ us.AddUserStory(DummyLocalUserStory(TestSharedUserStoryState))

test = Test()

user_story_runner.Run(

test, us, self.expectations, self.options, self.results)

@@ -258,8 +267,8 @@ class UserStoryRunnerTest(unittest.TestCase):

def testDiscardFirstResult(self):

us = user_story_set.UserStorySet()

- us.AddUserStory(user_story.UserStory(TestSharedUserStoryState))

+ us.AddUserStory(DummyLocalUserStory(TestSharedUserStoryState))

class Measurement(page_test.PageTest):

@property

def discard_first_result(self):

@@ -310,9 +319,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):

@@ -347,25 +356,21 @@ class UserStoryRunnerTest(unittest.TestCase):

ps = page_set.PageSet()

nednguyen 2014/12/08 00:45:55 This test now can modified to test user_story_set

chrishenry 2014/12/08 19:02:40 Done.

ps.AddPageWithDefaultRunNavigate('http://www.testurl.com')

# Page set missing archive_data_file.

- self.assertFalse(user_story_runner._CheckArchives(

- ps.archive_data_file, ps.wpr_archive_info, ps.pages))

+ self.assertFalse(user_story_runner._CheckArchives(ps))

ps = page_set.PageSet(archive_data_file='missing_archive_data_file.json')

ps.AddPageWithDefaultRunNavigate('http://www.testurl.com')

# 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))

+ self.assertFalse(user_story_runner._CheckArchives(ps))

ps = page_set.PageSet(archive_data_file='../../unittest_data/test.json',

bucket=page_set.PUBLIC_BUCKET)

ps.AddPageWithDefaultRunNavigate('http://www.testurl.com')

# Page set with valid archive_data_file.

- self.assertTrue(user_story_runner._CheckArchives(

- ps.archive_data_file, ps.wpr_archive_info, ps.pages))

+ self.assertTrue(user_story_runner._CheckArchives(ps))

ps.AddPageWithDefaultRunNavigate('http://www.google.com')

# 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))

+ self.assertFalse(user_story_runner._CheckArchives(ps))

ps = page_set.PageSet(

archive_data_file='../../unittest_data/test_missing_wpr_file.json',

@@ -374,5 +379,4 @@ class UserStoryRunnerTest(unittest.TestCase):

ps.AddPageWithDefaultRunNavigate('http://www.google.com')

# 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))

+ self.assertFalse(user_story_runner._CheckArchives(ps))