Chromium Code Reviews| Index: tools/perf/page_sets/loading_mobile.py |
| diff --git a/tools/perf/page_sets/loading_mobile.py b/tools/perf/page_sets/loading_mobile.py |
| index d3030b8ab99fd5e29134371a6124632444c4ecf5..011f6635630601e4c53eb43a2845dac7710b490e 100644 |
| --- a/tools/perf/page_sets/loading_mobile.py |
| +++ b/tools/perf/page_sets/loading_mobile.py |
| @@ -19,7 +19,8 @@ class LoadingMobileStorySet(story.StorySet): |
| def __init__(self, cache_temperatures=None, traffic_settings=None): |
| super(LoadingMobileStorySet, self).__init__( |
| archive_data_file='data/loading_mobile.json', |
| - cloud_storage_bucket=story.PARTNER_BUCKET) |
| + cloud_storage_bucket=story.PARTNER_BUCKET, |
| + verify_names=True) |
| if cache_temperatures is None: |
| cache_temperatures = [cache_temperature_module.ANY] |
| @@ -28,105 +29,105 @@ class LoadingMobileStorySet(story.StorySet): |
| traffic_settings = [traffic_setting_module.NONE] |
| self.AddStories(['global'], [ |
| - 'https://www.google.com/search?q=flower#q=flower+delivery', |
| - 'https://www.youtube.com/watch?v=MU3YuvNRhVY', |
| + ('https://www.google.com/search?q=flower#q=flower+delivery', 'google.com'), |
|
Kunihiko Sakamoto
2017/05/26 01:41:59
This actually goes to google.co.jp SERP because I
ashleymarie1
2017/05/26 13:21:31
Keeping with loading_desktop style, I changed it t
Kunihiko Sakamoto
2017/05/30 04:25:11
sgtm, thanks!
|
| + ('https://www.youtube.com/watch?v=MU3YuvNRhVY', 'youtube.com'), |
| # pylint: disable=line-too-long |
| - 'https://www.google.co.in/search?q=%E0%A4%AB%E0%A5%82%E0%A4%B2&rct=j#q=%E0%A4%AB%E0%A5%82%E0%A4%B2+%E0%A4%B5%E0%A4%BF%E0%A4%A4%E0%A4%B0%E0%A4%A3', |
| - 'https://www.google.com.br/search?q=flor#q=Entrega+de+flores&start=10', |
| + ('https://www.google.co.in/search?q=%E0%A4%AB%E0%A5%82%E0%A4%B2&rct=j#q=%E0%A4%AB%E0%A5%82%E0%A4%B2+%E0%A4%B5%E0%A4%BF%E0%A4%A4%E0%A4%B0%E0%A4%A3', 'google.co.in'), |
| + ('https://www.google.com.br/search?q=flor#q=Entrega+de+flores&start=10', 'google.com.br'), |
| # Disabled because of crbug.com/653775 |
| # pylint: disable=line-too-long |
| - # 'https://googleblog.blogspot.jp/2016/02/building-safer-web-for-everyone.html', |
| - 'https://www.google.co.id/#q=pengiriman+bunga', |
| - 'https://m.facebook.com/?soft=messages', |
| + # ('https://googleblog.blogspot.jp/2016/02/building-safer-web-for-everyone.html', 'googleblog.blogspot.jp'), |
| + ('https://www.google.co.id/#q=pengiriman+bunga', 'google.co.id'), |
| + ('https://m.facebook.com/?soft=messages', 'm.facebook.com'), |
| # Disabled because of crbug.com/656861 |
| # pylint: disable=line-too-long |
| - # 'http://g1.globo.com/politica/noticia/2016/02/maioria-do-stf-autoriza-fisco-obter-dados-bancarios-sem-decisao-judicial.html', |
| + # ('http://g1.globo.com/politica/noticia/2016/02/maioria-do-stf-autoriza-fisco-obter-dados-bancarios-sem-decisao-judicial.html', 'g1.globo.com'), |
| # pylint: disable=line-too-long |
| - 'https://m.baidu.com/s?word=%E9%B2%9C%E8%8A%B1%E9%80%9F%E9%80%92&oq=%E9%B2%9C%E8%8A%B1', |
| + ('https://m.baidu.com/s?word=%E9%B2%9C%E8%8A%B1%E9%80%9F%E9%80%92&oq=%E9%B2%9C%E8%8A%B1', 'm.baidu.com'), |
| # pylint: disable=line-too-long |
| - 'http://news.yahoo.com/were-top-10-most-visited-us-national-parks-105323727.html', |
| - 'https://en.m.wikipedia.org/wiki/Solo_Foods', |
| + ('http://news.yahoo.com/were-top-10-most-visited-us-national-parks-105323727.html', 'news.yahoo.com'), |
| + ('https://en.m.wikipedia.org/wiki/Solo_Foods', 'en.m.wikipedia.org'), |
| # pylint: disable=line-too-long |
| - 'http://noticias.bol.uol.com.br/ultimas-noticias/brasil/2016/08/03/tufao-nida-nao-deixa-vitimas-mas-prejuizos-de-us-43-milhoes.htm', |
| + ('http://noticias.bol.uol.com.br/ultimas-noticias/brasil/2016/08/03/tufao-nida-nao-deixa-vitimas-mas-prejuizos-de-us-43-milhoes.htm', 'noticias.bol.uol.com.br'), |
| # Disabled because of crbug.com/653775 |
| # pylint: disable=line-too-long |
| - # 'http://m.detik.com/finance/read/2016/02/19/151843/3146351/1034/ekspor-tambang-mentah-mau-dibuka-lagi-kalau-sudah-bangun-smelter-bagaimana', |
| - 'http://www.amazon.com/gp/aw/s/ref=is_s/189-8585431-1246432?k=shoes', |
| + # ('http://m.detik.com/finance/read/2016/02/19/151843/3146351/1034/ekspor-tambang-mentah-mau-dibuka-lagi-kalau-sudah-bangun-smelter-bagaimana', 'm.detik.com'), |
| + ('http://www.amazon.com/gp/aw/s/ref=is_s/189-8585431-1246432?k=shoes', 'amazon.com'), |
| # pylint: disable=line-too-long |
| - 'http://m.tribunnews.com/superskor/2016/08/03/ribuan-polisi-dikerahkan-mengawal-bonek', |
| - 'http://xw.qq.com/news/20160803025029/NEW2016080302502901', |
| + ('http://m.tribunnews.com/superskor/2016/08/03/ribuan-polisi-dikerahkan-mengawal-bonek', 'm.tribunnews.com'), |
| + ('http://xw.qq.com/news/20160803025029/NEW2016080302502901', 'xw.qq.com'), |
| # pylint: disable=line-too-long |
| - 'http://m.kaskus.co.id/thread/57a03a3214088d91068b4567/inilah-akibat-bersikap-overprotektif-terhadap-anak/?ref=homelanding&med=hot_thread', |
| - 'http://www.dailymotion.com/video/x3d1kj5_fallout-4-review_videogames', |
| - 'https://mobile.twitter.com/scottjehl/status/760618697727803394', |
| - 'http://m.kapanlagi.com/lirik/artis/anji/kata_siapa/', |
| + ('http://m.kaskus.co.id/thread/57a03a3214088d91068b4567/inilah-akibat-bersikap-overprotektif-terhadap-anak/?ref=homelanding&med=hot_thread', 'm.kaskus.co.id'), |
| + ('http://www.dailymotion.com/video/x3d1kj5_fallout-4-review_videogames', 'dailymotion.com'), |
| + ('https://mobile.twitter.com/scottjehl/status/760618697727803394', 'mobile.twitter.com'), |
| + ('http://m.kapanlagi.com/lirik/artis/anji/kata_siapa/', 'm.kapanlagi.com'), |
| # pylint: disable=line-too-long |
| - 'http://olx.co.id/iklan/iphone-6s-64-rose-gold-warna-favorite-IDiSdm5.html#5310a118c3;promoted', |
| + ('http://olx.co.id/iklan/iphone-6s-64-rose-gold-warna-favorite-IDiSdm5.html#5310a118c3;promoted', 'olx.co.id'), |
| # pylint: disable=line-too-long |
| - 'http://enquiry.indianrail.gov.in/mntes/MntesServlet?action=MainMenu&subAction=excep&excpType=EC', |
| + ('http://enquiry.indianrail.gov.in/mntes/MntesServlet?action=MainMenu&subAction=excep&excpType=EC', 'enquiry.indianrail.gov.in'), |
| ], cache_temperatures, traffic_settings) |
| self.AddStories(['pwa'], [ |
| # pylint: disable=line-too-long |
| - 'https://www.flipkart.com/big-wing-casuals/p/itmemeageyfn6m9z?lid=LSTSHOEMEAGURG2PHPW18FTBN&pid=SHOEMEAGURG2PHPW', |
| - 'https://smp.suumo.jp/mansion/tokyo/sc_104/cond/?moreCond=1', |
| + ('https://www.flipkart.com/big-wing-casuals/p/itmemeageyfn6m9z?lid=LSTSHOEMEAGURG2PHPW18FTBN&pid=SHOEMEAGURG2PHPW', 'flipkart.com'), |
|
rnephew (Reviews Here)
2017/05/25 19:22:58
On these one with long lines, the name should prob
ashleymarie1
2017/05/25 19:43:42
Makes sense, I'll go ahead and update those now
|
| + ('https://smp.suumo.jp/mansion/tokyo/sc_104/cond/?moreCond=1', 'smp.suumo.jp'), |
| # Disabled because of crbug.com/653775 |
| - # 'https://airhorner.com', |
| - 'https://guitar-tuner.appspot.com', |
| + # 'https://airhorner.com', 'airhorner.com'), |
| + ('https://guitar-tuner.appspot.com', 'guitar-tuner.appspot.com'), |
| # Disabled because of crbug.com/653775 |
| - # 'https://busrouter.sg', |
| - 'https://andreasbovens.github.io/inbox-attack/', |
| - 'https://voice-memos.appspot.com', |
| + # ('https://busrouter.sg', 'busrouter.sg'), |
| + ('https://andreasbovens.github.io/inbox-attack/', 'andreasbovens.github.io'), |
| + ('https://voice-memos.appspot.com', 'voice-memos.appspot.com'), |
| # Disabled because of crbug.com/653775 |
| - # 'https://wiki-offline.jakearchibald.com/', |
| - 'https://dev.opera.com/', |
| - 'https://www.pokedex.org/', |
| - 'https://2048-opera-pwa.surge.sh/', |
| - 'https://jakearchibald.github.io/trained-to-thrill/', |
| - 'https://townwork.net', |
| - 'https://flipboard.com/topic/yoga', |
| + # ('https://wiki-offline.jakearchibald.com/', 'wiki-offline.jakearchibald.com'), |
| + ('https://dev.opera.com/', 'dev.opera.com'), |
|
rnephew (Reviews Here)
2017/05/25 19:22:58
I know on loading_desktop for the most part we tri
ashleymarie1
2017/05/25 19:43:42
I'll wait for the loading-dev folks to chime in he
Kunihiko Sakamoto
2017/05/26 01:41:59
Yeah, I think it's better to align with loading_de
ashleymarie1
2017/05/26 13:21:31
Done! :)
|
| + ('https://www.pokedex.org/', 'pokedex.org'), |
| + ('https://2048-opera-pwa.surge.sh/', '2048-opera-pwa.surge.sh'), |
| + ('https://jakearchibald.github.io/trained-to-thrill/', 'jakearchibald.github.io'), |
| + ('https://townwork.net', 'townwork.net'), |
| + ('https://flipboard.com/topic/yoga', 'flipboard.com'), |
| ], cache_temperatures, traffic_settings) |
| self.AddStories(['tough_ttfmp'], [ |
| - 'http://www.localmoxie.com', |
| - 'http://www.dawn.com', |
| - 'http://www.thairath.co.th', |
| + ('http://www.localmoxie.com', 'localmoxie.com'), |
| + ('http://www.dawn.com', 'dawn.com'), |
| + ('http://www.thairath.co.th', 'thairath.co.th'), |
| # Disabled to avoid Nexus5X bot timeout crbug.com/702175 |
| - # 'http://www.hashocean.com', |
| - # 'http://www.163.com', |
| + # ('http://www.hashocean.com', 'hashocean.com'), |
| + # ('http://www.163.com', '163.com'), |
| ], cache_temperatures, traffic_settings) |
| self.AddStories(['easy_ttfmp'], [ |
| - 'http://www.slideshare.net', |
| - 'http://www.bradesco.com.br', |
| - 'http://www.gsshop.com', |
| + ('http://www.slideshare.net', 'slideshare.net'), |
| + ('http://www.bradesco.com.br', 'bradesco.com.br'), |
| + ('http://www.gsshop.com', 'gsshop.com'), |
| # Disabled to avoid Nexus5X bot timeout crbug.com/702175 |
| - # 'http://www.sbs.co.kr', |
| - # 'http://www.futura-sciences.com', |
| + # ('http://www.sbs.co.kr', 'sbs.co.kr'), |
| + # ('http://www.futura-sciences.com', 'futura-sciences.com'), |
| ], cache_temperatures, traffic_settings) |
| self.AddStories(['tough_tti'], [ |
| - 'http://www.thestar.com.my', |
| - 'http://www.58pic.com', |
| - 'http://www.hongkiat.com', |
| + ('http://www.thestar.com.my', 'thestar.com.my'), |
| + ('http://www.58pic.com', '58pic.com'), |
| + ('http://www.hongkiat.com', 'hongkiat.com'), |
| # Disabled to avoid Nexus5X bot timeout crbug.com/702175 |
| - # 'http://www.ebs.in', |
| - # 'http://www.ibicn.com', |
| + # ('http://www.ebs.in', 'ebs.in'), |
| + # ('http://www.ibicn.com', 'ibicn.com'), |
| ], cache_temperatures, traffic_settings) |
| self.AddStories(['easy_tti'], [ |
| - 'http://www.dramaq.com.tw', |
| - 'http://www.locanto.in', |
| - 'http://www.francetvinfo.fr', |
| + ('http://www.dramaq.com.tw', 'dramaq.com.tw'), |
| + ('http://www.locanto.in', 'locanto.in'), |
| + ('http://www.francetvinfo.fr', 'francetvinfo.fr'), |
| # Disabled to avoid Nexus5X bot timeout crbug.com/702175 |
| - # 'http://www.gfk.com', |
| - # 'http://www.mlsmatrix.com' |
| + # ('http://www.gfk.com', 'gfk.com'), |
| + # ('http://www.mlsmatrix.com' 'mlsmatrix.com'), |
| ], cache_temperatures, traffic_settings) |
| def AddStories(self, tags, urls, cache_temperatures, traffic_settings): |
| - for url in urls: |
| + for url, name in urls: |
| for temp in cache_temperatures: |
| for traffic in traffic_settings: |
| - self.AddStory(page_cycler_story.PageCyclerStory(url, self, |
| + self.AddStory(page_cycler_story.PageCyclerStory(url, self, name=name, |
| shared_page_state_class=shared_page_state.SharedMobilePageState, |
| cache_temperature=temp, traffic_setting=traffic, tags=tags)) |