Commit 4671c00c authored by Amy Qiu's avatar Amy Qiu Committed by Commit Bot

Merge tough_pinch_zoom_cases into rendering page sets

Move tough_pinch_zoom_cases into the rendering folder and refactor to
inherit from RenderingStory

Bug: 849392
Change-Id: I6496aacc50aa730843d677e73c89f3025b0799ba
Reviewed-on: https://chromium-review.googlesource.com/1087726
Commit-Queue: Amy Qiu <amyqiu@google.com>
Reviewed-by: default avatarNed Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#564941}
parent 6e373bd3
...@@ -168,6 +168,7 @@ crbug.com/653993 [ Android_Webview ] rendering.mobile/maps_perf_test [ Skip ] ...@@ -168,6 +168,7 @@ crbug.com/653993 [ Android_Webview ] rendering.mobile/maps_perf_test [ Skip ]
[ All ] rendering.mobile/paper_shadow [ Skip ] # Polymer test, needs to be modernized. [ All ] rendering.mobile/paper_shadow [ Skip ] # Polymer test, needs to be modernized.
[ All ] rendering.mobile/paper_tabs [ Skip ] # Polymer test, needs to be modernized. [ All ] rendering.mobile/paper_tabs [ Skip ] # Polymer test, needs to be modernized.
[ All ] rendering.mobile/paper_toggle_button [ Skip ] # Polymer test, needs to be modernized. [ All ] rendering.mobile/paper_toggle_button [ Skip ] # Polymer test, needs to be modernized.
crbug.com/822925 [ Android_Webview ] rendering.mobile/yahoo_games_pinch [ Skip ]
# Benchmark: smoothness.gpu_rasterization.polymer # Benchmark: smoothness.gpu_rasterization.polymer
[ All ] smoothness.gpu_rasterization.polymer/* [ Skip ] # Test needs to be modernized. [ All ] smoothness.gpu_rasterization.polymer/* [ Skip ] # Test needs to be modernized.
......
...@@ -203,6 +203,60 @@ ...@@ -203,6 +203,60 @@
}, },
"many_planets_deep": { "many_planets_deep": {
"DEFAULT": "tough_webgl_cases_006.wprgo" "DEFAULT": "tough_webgl_cases_006.wprgo"
},
"blogspot_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"espn_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"facebook_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"linkedin_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"twitter_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"weather_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"booking_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"yahoo_games_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"yahoo_news_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"yahoo_sports_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"amazon_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"cnn_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"ebay_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"youtube_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"gmail_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"google_search_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"google_calendar_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"google_image_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
} }
}, },
"description": "Describes the Web Page Replay archives for a story set. Don't edit by hand! Use record_wpr for updating.", "description": "Describes the Web Page Replay archives for a story set. Don't edit by hand! Use record_wpr for updating.",
......
...@@ -590,6 +590,60 @@ ...@@ -590,6 +590,60 @@
}, },
"paper_toggle_button": { "paper_toggle_button": {
"DEFAULT": "polymer_001.wprgo" "DEFAULT": "polymer_001.wprgo"
},
"blogspot_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"espn_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"facebook_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"linkedin_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"twitter_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"weather_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"booking_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"yahoo_games_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"yahoo_news_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"yahoo_sports_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"amazon_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"cnn_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"ebay_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"youtube_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"gmail_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"google_search_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"google_calendar_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
},
"google_image_pinch": {
"DEFAULT": "tough_pinch_zoom_cases_000.wprgo"
} }
}, },
"description": "Describes the Web Page Replay archives for a story set. Don't edit by hand! Use record_wpr for updating.", "description": "Describes the Web Page Replay archives for a story set. Don't edit by hand! Use record_wpr for updating.",
......
...@@ -9,6 +9,12 @@ from telemetry.page import shared_page_state ...@@ -9,6 +9,12 @@ from telemetry.page import shared_page_state
class RenderingSharedState(shared_page_state.SharedPageState): class RenderingSharedState(shared_page_state.SharedPageState):
def CanRunOnBrowser(self, browser_info, page): def CanRunOnBrowser(self, browser_info, page):
if page.TAGS and story_tags.PINCH_ZOOM in page.TAGS:
os_name = self.platform.GetOSName()
if os_name == 'linux' or os_name == 'win':
logging.warning('Pinch zoom pages only for Mac, skipping test')
return False
if page.TAGS and story_tags.REQUIRED_WEBGL in page.TAGS: if page.TAGS and story_tags.REQUIRED_WEBGL in page.TAGS:
assert hasattr(page, 'skipped_gpus') assert hasattr(page, 'skipped_gpus')
......
...@@ -19,6 +19,8 @@ FASTPATH = Tag( ...@@ -19,6 +19,8 @@ FASTPATH = Tag(
'fastpath', 'Fast path stories.') 'fastpath', 'Fast path stories.')
REQUIRED_WEBGL = Tag( REQUIRED_WEBGL = Tag(
'required_webgl', 'Stories that are skipped if no webgl support') 'required_webgl', 'Stories that are skipped if no webgl support')
PINCH_ZOOM = Tag(
'pinch_zoom', 'Stories that only run on Mac for desktop cases')
def _ExtractAllTags(): def _ExtractAllTags():
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment