chrome/test/functional/media/media_constrained_network_perf.py - Issue 10825051: Update CNS to run on chromeperf34 and CNS tests to run on windows perf_av bot.

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: chrome/test/functional/media/media_constrained_network_perf.py

Issue 10825051: Update CNS to run on chromeperf34 and CNS tests to run on windows perf_av bot. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 5 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:

View side-by-side diff with in-line comments

Download patch

« chrome/test/functional/media/cns_test_base.py ('K') | « chrome/test/functional/media/cns_test_base.py ('k') | chrome/test/functional/media/media_seek_perf.py » ('j') | media/tools/constrained_network_server/cns.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/functional/media/media_constrained_network_perf.py

diff --git a/chrome/test/functional/media/media_constrained_network_perf.py b/chrome/test/functional/media/media_constrained_network_perf.py

index d78567f6c9dbc15e9c65cdc0697524aa85091a74..d06b82d10c6e45a339b72c4c7aac922ec1056e0c 100755

--- a/chrome/test/functional/media/media_constrained_network_perf.py

+++ b/chrome/test/functional/media/media_constrained_network_perf.py

@@ -21,6 +21,7 @@ The CNS code is located under: <root>/src/media/tools/constrained_network_server

import logging

import os

+import posixpath

import Queue

import pyauto_media

@@ -54,14 +55,14 @@ _TEST_ITERATIONS = 3

# Media file names used for measuring epp and tpp.

_TEST_MEDIA_EPP = ['roller.webm']

-_TEST_MEDIA_EPP.extend(os.path.join('crowd', name) for name in

+_TEST_MEDIA_EPP.extend(posixpath.join('crowd', name) for name in

['crowd360.ogv', 'crowd.wav', 'crowd.ogg'])

# Media file names used for measuring tpp without epp.

-_TEST_MEDIA_NO_EPP = [os.path.join('dartmoor', name) for name in

+_TEST_MEDIA_NO_EPP = [posixpath.join('dartmoor', name) for name in

['dartmoor2.ogg', 'dartmoor2.m4a', 'dartmoor2.mp3',

'dartmoor2.wav']]

-_TEST_MEDIA_NO_EPP.extend(os.path.join('crowd', name) for name in

+_TEST_MEDIA_NO_EPP.extend(posixpath.join('crowd', name) for name in

['crowd1080.webm', 'crowd1080.ogv', 'crowd1080.mp4',

'crowd360.webm', 'crowd360.mp4'])