tools/telemetry/telemetry/page/page_unittest.py - Issue 954563002: Move base_dir to user_story_set, remove file_path.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/telemetry/telemetry/page/page_unittest.py

Issue 954563002: Move base_dir to user_story_set, remove file_path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: tools/telemetry/telemetry/page/page_unittest.py

diff --git a/tools/telemetry/telemetry/page/page_unittest.py b/tools/telemetry/telemetry/page/page_unittest.py

index 4a855089a29351f8b9f11317062c3ea38cf092f2..bc6b834ec3d08b50786ec9ebeee34b01d37c35af 100644

--- a/tools/telemetry/telemetry/page/page_unittest.py

+++ b/tools/telemetry/telemetry/page/page_unittest.py

@@ -52,9 +52,12 @@ class TestPage(unittest.TestCase):

pages)

def testGetUrlBaseDirAndFileForUrlBaseDir(self):

- ps = page_set.PageSet(file_path='basedir/', serving_dirs=['../somedir/'])

+ base_dir = os.path.dirname(__file__)

+ file_path = os.path.join(os.path.dirname(base_dir), 'otherdir', 'file.html')

+ ps = page_set.PageSet(file_path=base_dir,

+ serving_dirs=[os.path.join('..', 'somedir', '')])

ps.AddUserStory(page.Page('file://../otherdir/file.html', ps, ps.base_dir))

- self.assertPathEqual(ps[0].file_path, 'otherdir/file.html')

+ self.assertPathEqual(ps[0].file_path, file_path)

def testDisplayUrlForHttp(self):

ps = page_set.PageSet(file_path=os.path.dirname(__file__))