diff options
63 files changed, 160 insertions, 156 deletions
diff --git a/tools/skp/page_sets/skia_amazon_desktop.py b/tools/skp/page_sets/skia_amazon_desktop.py index 961ea66881..1509c35dd7 100644 --- a/tools/skp/page_sets/skia_amazon_desktop.py +++ b/tools/skp/page_sets/skia_amazon_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class AmazonDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(AmazonDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_amazon_desktop.json') diff --git a/tools/skp/page_sets/skia_androidpolice_nexus10.py b/tools/skp/page_sets/skia_androidpolice_nexus10.py index 207bf7a732..dbbca39418 100644 --- a/tools/skp/page_sets/skia_androidpolice_nexus10.py +++ b/tools/skp/page_sets/skia_androidpolice_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class AndroidPoliceNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(AndroidPoliceNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_androidpolice_nexus10.json') diff --git a/tools/skp/page_sets/skia_baidu_desktop.py b/tools/skp/page_sets/skia_baidu_desktop.py index 946d5a74a8..0b4a57a764 100644 --- a/tools/skp/page_sets/skia_baidu_desktop.py +++ b/tools/skp/page_sets/skia_baidu_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class BaiduDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(BaiduDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_baidu_desktop.json') diff --git a/tools/skp/page_sets/skia_blogger_desktop.py b/tools/skp/page_sets/skia_blogger_desktop.py index 801cf0d7f6..c5e31ee78c 100644 --- a/tools/skp/page_sets/skia_blogger_desktop.py +++ b/tools/skp/page_sets/skia_blogger_desktop.py @@ -27,12 +27,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(60) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class BloggerDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(BloggerDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_blogger_desktop.json') diff --git a/tools/skp/page_sets/skia_booking_desktop.py b/tools/skp/page_sets/skia_booking_desktop.py index 8ab54750da..8ce9c5ddc2 100644 --- a/tools/skp/page_sets/skia_booking_desktop.py +++ b/tools/skp/page_sets/skia_booking_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class BookingDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(BookingDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_booking_desktop.json') diff --git a/tools/skp/page_sets/skia_carsvg_desktop.py b/tools/skp/page_sets/skia_carsvg_desktop.py index 13550f516b..3d4bfaa82c 100644 --- a/tools/skp/page_sets/skia_carsvg_desktop.py +++ b/tools/skp/page_sets/skia_carsvg_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class CarsvgDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(CarsvgDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_carsvg_desktop.json') diff --git a/tools/skp/page_sets/skia_chalkboard_desktop.py b/tools/skp/page_sets/skia_chalkboard_desktop.py index fab91f6206..7156a678e1 100644 --- a/tools/skp/page_sets/skia_chalkboard_desktop.py +++ b/tools/skp/page_sets/skia_chalkboard_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class ChalkboardDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(ChalkboardDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_chalkboard_desktop.json') diff --git a/tools/skp/page_sets/skia_cnet_nexus10.py b/tools/skp/page_sets/skia_cnet_nexus10.py index 6672a69335..7e827b825f 100644 --- a/tools/skp/page_sets/skia_cnet_nexus10.py +++ b/tools/skp/page_sets/skia_cnet_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class CnetNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(CnetNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_cnet_nexus10.json') diff --git a/tools/skp/page_sets/skia_css3gradients_desktop.py b/tools/skp/page_sets/skia_css3gradients_desktop.py index ef80f5cea9..811b93096f 100644 --- a/tools/skp/page_sets/skia_css3gradients_desktop.py +++ b/tools/skp/page_sets/skia_css3gradients_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class Css3DesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(Css3DesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_css3gradients_desktop.json') diff --git a/tools/skp/page_sets/skia_culturalsolutions_nexus10.py b/tools/skp/page_sets/skia_culturalsolutions_nexus10.py index 4157faaa2d..151f5b3f1c 100644 --- a/tools/skp/page_sets/skia_culturalsolutions_nexus10.py +++ b/tools/skp/page_sets/skia_culturalsolutions_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class CulturalNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(CulturalNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_culturalsolutions_nexus10.json') diff --git a/tools/skp/page_sets/skia_cuteoverload_nexus10.py b/tools/skp/page_sets/skia_cuteoverload_nexus10.py index cc43e858c7..69bc76575e 100644 --- a/tools/skp/page_sets/skia_cuteoverload_nexus10.py +++ b/tools/skp/page_sets/skia_cuteoverload_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class CuteOverloadNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(CuteOverloadNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_cuteoverload_nexus10.json') diff --git a/tools/skp/page_sets/skia_deviantart_nexus10.py b/tools/skp/page_sets/skia_deviantart_nexus10.py index 5e5c29a268..bdbf2b2a54 100644 --- a/tools/skp/page_sets/skia_deviantart_nexus10.py +++ b/tools/skp/page_sets/skia_deviantart_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class DeviantartNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(DeviantartNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_deviantart_nexus10.json') diff --git a/tools/skp/page_sets/skia_digg_nexus10.py b/tools/skp/page_sets/skia_digg_nexus10.py index dd764b03dd..db08c730e7 100644 --- a/tools/skp/page_sets/skia_digg_nexus10.py +++ b/tools/skp/page_sets/skia_digg_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class DiggNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(DiggNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_digg_nexus10.json') diff --git a/tools/skp/page_sets/skia_ebay_desktop.py b/tools/skp/page_sets/skia_ebay_desktop.py index 4f5adb67fb..f5eab364c7 100644 --- a/tools/skp/page_sets/skia_ebay_desktop.py +++ b/tools/skp/page_sets/skia_ebay_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class EbayDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(EbayDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_ebay_desktop.json') diff --git a/tools/skp/page_sets/skia_engadget_nexus10.py b/tools/skp/page_sets/skia_engadget_nexus10.py index 65ea2c18ae..611b10c168 100644 --- a/tools/skp/page_sets/skia_engadget_nexus10.py +++ b/tools/skp/page_sets/skia_engadget_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class EngadgetNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(EngadgetNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_engadget_nexus10.json') diff --git a/tools/skp/page_sets/skia_espn_desktop.py b/tools/skp/page_sets/skia_espn_desktop.py index 5061c55f35..7b5f5da3d0 100644 --- a/tools/skp/page_sets/skia_espn_desktop.py +++ b/tools/skp/page_sets/skia_espn_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class EspnDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(EspnDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_espn_desktop.json') diff --git a/tools/skp/page_sets/skia_facebook_desktop.py b/tools/skp/page_sets/skia_facebook_desktop.py index 167c37ebb1..528ced98b9 100644 --- a/tools/skp/page_sets/skia_facebook_desktop.py +++ b/tools/skp/page_sets/skia_facebook_desktop.py @@ -28,12 +28,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class FacebookDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(FacebookDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_facebook_desktop.json') diff --git a/tools/skp/page_sets/skia_fontwipe_desktop.py b/tools/skp/page_sets/skia_fontwipe_desktop.py index 381a831986..44b234f62a 100644 --- a/tools/skp/page_sets/skia_fontwipe_desktop.py +++ b/tools/skp/page_sets/skia_fontwipe_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class FontwipeDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(FontwipeDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_fontwipe_desktop.json') diff --git a/tools/skp/page_sets/skia_forecastio_desktop.py b/tools/skp/page_sets/skia_forecastio_desktop.py index 8c4d39c684..5ffed14998 100644 --- a/tools/skp/page_sets/skia_forecastio_desktop.py +++ b/tools/skp/page_sets/skia_forecastio_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(20) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class ForecastioDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(ForecastioDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_forecastio_desktop.json') diff --git a/tools/skp/page_sets/skia_frantzen_nexus10.py b/tools/skp/page_sets/skia_frantzen_nexus10.py index 4017e25b16..8f1391911d 100644 --- a/tools/skp/page_sets/skia_frantzen_nexus10.py +++ b/tools/skp/page_sets/skia_frantzen_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class FrantzenNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(FrantzenNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_frantzen_nexus10.json') diff --git a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py index 5e1c52ae95..03a05eaeef 100644 --- a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py +++ b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class GamedeksiamNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(GamedeksiamNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_gamedeksiam_nexus10.json') diff --git a/tools/skp/page_sets/skia_gmail_nexus10.py b/tools/skp/page_sets/skia_gmail_nexus10.py index 2f5f090f5c..8e4e314f11 100644 --- a/tools/skp/page_sets/skia_gmail_nexus10.py +++ b/tools/skp/page_sets/skia_gmail_nexus10.py @@ -27,12 +27,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(10) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class GmailNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(GmailNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_gmail_nexus10.json') diff --git a/tools/skp/page_sets/skia_gmailthread_desktop.py b/tools/skp/page_sets/skia_gmailthread_desktop.py index 03409b8287..0b2782cf35 100644 --- a/tools/skp/page_sets/skia_gmailthread_desktop.py +++ b/tools/skp/page_sets/skia_gmailthread_desktop.py @@ -27,12 +27,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(60) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class GmailthreadDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(GmailthreadDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_gmailthread_desktop.json') diff --git a/tools/skp/page_sets/skia_googleblog_nexus10.py b/tools/skp/page_sets/skia_googleblog_nexus10.py index 4e358c23be..c4b2bb4f9a 100644 --- a/tools/skp/page_sets/skia_googleblog_nexus10.py +++ b/tools/skp/page_sets/skia_googleblog_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class GoogleblogNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(GoogleblogNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_googleblog_nexus10.json') diff --git a/tools/skp/page_sets/skia_googlecalendar_nexus10.py b/tools/skp/page_sets/skia_googlecalendar_nexus10.py index 41224e332d..61ab231828 100644 --- a/tools/skp/page_sets/skia_googlecalendar_nexus10.py +++ b/tools/skp/page_sets/skia_googlecalendar_nexus10.py @@ -27,12 +27,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class GoogleCalendarNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(GoogleCalendarNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_googlecalendar_nexus10.json') diff --git a/tools/skp/page_sets/skia_googlehome_desktop.py b/tools/skp/page_sets/skia_googlehome_desktop.py index 35857b3502..6ae3c893fe 100644 --- a/tools/skp/page_sets/skia_googlehome_desktop.py +++ b/tools/skp/page_sets/skia_googlehome_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class GooglehomeDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(GooglehomeDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_googlehome_desktop.json') diff --git a/tools/skp/page_sets/skia_googleplus_desktop.py b/tools/skp/page_sets/skia_googleplus_desktop.py index c95166ccc5..d2a39e9fa5 100644 --- a/tools/skp/page_sets/skia_googleplus_desktop.py +++ b/tools/skp/page_sets/skia_googleplus_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class GooglePlusDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(GooglePlusDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_googleplus_desktop.json') diff --git a/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py b/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py index 079caff771..8bebf73508 100644 --- a/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py +++ b/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py @@ -27,12 +27,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(10) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class GoogleSpreadsheetDashedDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(GoogleSpreadsheetDashedDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_googlespreadsheetdashed_desktop.json') diff --git a/tools/skp/page_sets/skia_gspro_nexus10.py b/tools/skp/page_sets/skia_gspro_nexus10.py index f385d8aa63..b4768332e8 100644 --- a/tools/skp/page_sets/skia_gspro_nexus10.py +++ b/tools/skp/page_sets/skia_gspro_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class GsproNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(GsproNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_gspro_nexus10.json') diff --git a/tools/skp/page_sets/skia_gws_desktop.py b/tools/skp/page_sets/skia_gws_desktop.py index 195ede9d13..8b7238b567 100644 --- a/tools/skp/page_sets/skia_gws_desktop.py +++ b/tools/skp/page_sets/skia_gws_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class GwsDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(GwsDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_gws_desktop.json') diff --git a/tools/skp/page_sets/skia_hsfi_nexus10.py b/tools/skp/page_sets/skia_hsfi_nexus10.py index e2510365bf..f6fb04f8d3 100644 --- a/tools/skp/page_sets/skia_hsfi_nexus10.py +++ b/tools/skp/page_sets/skia_hsfi_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class HsfiNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(HsfiNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_hsfi_nexus10.json') diff --git a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py index c9c337bf7d..db1844c786 100644 --- a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py +++ b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(10) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class JsfiddleBigcarDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(JsfiddleBigcarDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_jsfiddlebigcar_desktop.json') diff --git a/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py b/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py index b26c5f07a5..f9716b4d25 100644 --- a/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py +++ b/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(10) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class JsfiddleHumperDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(JsfiddleHumperDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_jsfiddlehumperclip_desktop.json') diff --git a/tools/skp/page_sets/skia_linkedin_desktop.py b/tools/skp/page_sets/skia_linkedin_desktop.py index f8449cac63..94700e2750 100644 --- a/tools/skp/page_sets/skia_linkedin_desktop.py +++ b/tools/skp/page_sets/skia_linkedin_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class LinkedinDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(LinkedinDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_linkedin_desktop.json') diff --git a/tools/skp/page_sets/skia_mapsvg_desktop.py b/tools/skp/page_sets/skia_mapsvg_desktop.py index 57130f7ed2..3159dc44ea 100644 --- a/tools/skp/page_sets/skia_mapsvg_desktop.py +++ b/tools/skp/page_sets/skia_mapsvg_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(10) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class MapsvgDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(MapsvgDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_mapsvg_desktop.json') diff --git a/tools/skp/page_sets/skia_mercurynews_nexus10.py b/tools/skp/page_sets/skia_mercurynews_nexus10.py index c161036feb..93436735b1 100644 --- a/tools/skp/page_sets/skia_mercurynews_nexus10.py +++ b/tools/skp/page_sets/skia_mercurynews_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class MercurynewsNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(MercurynewsNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_mercurynews_nexus10.json') diff --git a/tools/skp/page_sets/skia_mlb_nexus10.py b/tools/skp/page_sets/skia_mlb_nexus10.py index d6326c3663..0118edad7b 100644 --- a/tools/skp/page_sets/skia_mlb_nexus10.py +++ b/tools/skp/page_sets/skia_mlb_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class MlbNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(MlbNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_mlb_nexus10.json') diff --git a/tools/skp/page_sets/skia_mobilenews_desktop.py b/tools/skp/page_sets/skia_mobilenews_desktop.py index dc7e176bf8..7b334c4cdf 100644 --- a/tools/skp/page_sets/skia_mobilenews_desktop.py +++ b/tools/skp/page_sets/skia_mobilenews_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(10) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class MobilenewsDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(MobilenewsDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_mobilenews_desktop.json') diff --git a/tools/skp/page_sets/skia_mozilla_nexus10.py b/tools/skp/page_sets/skia_mozilla_nexus10.py index f1a39dd836..5e04d92827 100644 --- a/tools/skp/page_sets/skia_mozilla_nexus10.py +++ b/tools/skp/page_sets/skia_mozilla_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class MozillaNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(MozillaNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_mozilla_nexus10.json') diff --git a/tools/skp/page_sets/skia_nofolo_nexus10.py b/tools/skp/page_sets/skia_nofolo_nexus10.py index 986ed371f6..afc97c00ab 100644 --- a/tools/skp/page_sets/skia_nofolo_nexus10.py +++ b/tools/skp/page_sets/skia_nofolo_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class NofoloNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(NofoloNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_nofolo_nexus10.json') diff --git a/tools/skp/page_sets/skia_nytimes_nexus10.py b/tools/skp/page_sets/skia_nytimes_nexus10.py index 8d9850375c..f68ec76b08 100644 --- a/tools/skp/page_sets/skia_nytimes_nexus10.py +++ b/tools/skp/page_sets/skia_nytimes_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class NytimesNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(NytimesNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_nytimes_nexus10.json') diff --git a/tools/skp/page_sets/skia_oldinboxapp_desktop.py b/tools/skp/page_sets/skia_oldinboxapp_desktop.py index 798a6c869d..747fde032d 100644 --- a/tools/skp/page_sets/skia_oldinboxapp_desktop.py +++ b/tools/skp/page_sets/skia_oldinboxapp_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class OldinboxappDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(OldinboxappDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_oldinboxapp_desktop.json') diff --git a/tools/skp/page_sets/skia_pinterest_desktop.py b/tools/skp/page_sets/skia_pinterest_desktop.py index 218ccab62f..6035f2d363 100644 --- a/tools/skp/page_sets/skia_pinterest_desktop.py +++ b/tools/skp/page_sets/skia_pinterest_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class PinterestDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(PinterestDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_pinterest_desktop.json') diff --git a/tools/skp/page_sets/skia_pokemonwiki_desktop.py b/tools/skp/page_sets/skia_pokemonwiki_desktop.py index 5d32731a8b..aafc988a3c 100644 --- a/tools/skp/page_sets/skia_pokemonwiki_desktop.py +++ b/tools/skp/page_sets/skia_pokemonwiki_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class PokemonwikiDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(PokemonwikiDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_pokemonwiki_desktop.json') diff --git a/tools/skp/page_sets/skia_pravda_nexus10.py b/tools/skp/page_sets/skia_pravda_nexus10.py index a7792b1725..7935a14684 100644 --- a/tools/skp/page_sets/skia_pravda_nexus10.py +++ b/tools/skp/page_sets/skia_pravda_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(10) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class PravdaNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(PravdaNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_pravda_nexus10.json') diff --git a/tools/skp/page_sets/skia_rectangletransition_desktop.py b/tools/skp/page_sets/skia_rectangletransition_desktop.py index 1783117608..5bfc0fb3db 100644 --- a/tools/skp/page_sets/skia_rectangletransition_desktop.py +++ b/tools/skp/page_sets/skia_rectangletransition_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class RectangletransitionDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(RectangletransitionDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_rectangletransition_desktop.json') diff --git a/tools/skp/page_sets/skia_sahadan_nexus10.py b/tools/skp/page_sets/skia_sahadan_nexus10.py index c6c4dcbe98..dc8862bf4c 100644 --- a/tools/skp/page_sets/skia_sahadan_nexus10.py +++ b/tools/skp/page_sets/skia_sahadan_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class SahadanNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(SahadanNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_sahadan_nexus10.json') diff --git a/tools/skp/page_sets/skia_samoasvg_desktop.py b/tools/skp/page_sets/skia_samoasvg_desktop.py index 8242872d0b..3f2be0d741 100644 --- a/tools/skp/page_sets/skia_samoasvg_desktop.py +++ b/tools/skp/page_sets/skia_samoasvg_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class SamoasvgDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(SamoasvgDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_samoasvg_desktop.json') diff --git a/tools/skp/page_sets/skia_sfgate_desktop.py b/tools/skp/page_sets/skia_sfgate_desktop.py index 892d46794c..e8ed1dc0e3 100644 --- a/tools/skp/page_sets/skia_sfgate_desktop.py +++ b/tools/skp/page_sets/skia_sfgate_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class SfgateDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(SfgateDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_sfgate_desktop.json') diff --git a/tools/skp/page_sets/skia_slashdot_nexus10.py b/tools/skp/page_sets/skia_slashdot_nexus10.py index 1c1a58b2fe..f3a4bf5df9 100644 --- a/tools/skp/page_sets/skia_slashdot_nexus10.py +++ b/tools/skp/page_sets/skia_slashdot_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class SlashdotNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(SlashdotNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_slashdot_nexus10.json') diff --git a/tools/skp/page_sets/skia_techmeme_nexus10.py b/tools/skp/page_sets/skia_techmeme_nexus10.py index 905bd718db..a8be047c43 100644 --- a/tools/skp/page_sets/skia_techmeme_nexus10.py +++ b/tools/skp/page_sets/skia_techmeme_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class TechmemeNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(TechmemeNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_techmeme_nexus10.json') diff --git a/tools/skp/page_sets/skia_tigersvg_desktop.py b/tools/skp/page_sets/skia_tigersvg_desktop.py index fede7404e6..33f0b5335a 100644 --- a/tools/skp/page_sets/skia_tigersvg_desktop.py +++ b/tools/skp/page_sets/skia_tigersvg_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class TigersvgDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(TigersvgDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_tigersvg_desktop.json') diff --git a/tools/skp/page_sets/skia_twitter_desktop.py b/tools/skp/page_sets/skia_twitter_desktop.py index 8500137893..d9ec66f7dd 100644 --- a/tools/skp/page_sets/skia_twitter_desktop.py +++ b/tools/skp/page_sets/skia_twitter_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class TwitterDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(TwitterDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_twitter_desktop.json') diff --git a/tools/skp/page_sets/skia_ukwsj_nexus10.py b/tools/skp/page_sets/skia_ukwsj_nexus10.py index abc0b3a120..6f35d7c795 100644 --- a/tools/skp/page_sets/skia_ukwsj_nexus10.py +++ b/tools/skp/page_sets/skia_ukwsj_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class UkwsjNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(UkwsjNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_ukwsj_nexus10.json') diff --git a/tools/skp/page_sets/skia_vnexpress_nexus10.py b/tools/skp/page_sets/skia_vnexpress_nexus10.py index 781e24a543..51b2e57177 100644 --- a/tools/skp/page_sets/skia_vnexpress_nexus10.py +++ b/tools/skp/page_sets/skia_vnexpress_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class VnexpressNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(VnexpressNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_vnexpress_nexus10.json') diff --git a/tools/skp/page_sets/skia_weather_desktop.py b/tools/skp/page_sets/skia_weather_desktop.py index 13d838938a..cae33b7d18 100644 --- a/tools/skp/page_sets/skia_weather_desktop.py +++ b/tools/skp/page_sets/skia_weather_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class WeatherDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(WeatherDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_weather_desktop.json') diff --git a/tools/skp/page_sets/skia_wikipedia_galaxynexus.py b/tools/skp/page_sets/skia_wikipedia_galaxynexus.py index d799de9657..bcbe04ae79 100644 --- a/tools/skp/page_sets/skia_wikipedia_galaxynexus.py +++ b/tools/skp/page_sets/skia_wikipedia_galaxynexus.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class WikipediaGalaxynexusPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(WikipediaGalaxynexusPageSet, self).__init__( user_agent_type='mobile', archive_data_file='data/skia_wikipedia_galaxynexus.json') diff --git a/tools/skp/page_sets/skia_worldjournal_nexus10.py b/tools/skp/page_sets/skia_worldjournal_nexus10.py index 333eed49e7..0d7be05064 100644 --- a/tools/skp/page_sets/skia_worldjournal_nexus10.py +++ b/tools/skp/page_sets/skia_worldjournal_nexus10.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class WorldjournalNexus10PageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(WorldjournalNexus10PageSet, self).__init__( user_agent_type='tablet', archive_data_file='data/skia_worldjournal_nexus10.json') diff --git a/tools/skp/page_sets/skia_wowwiki_desktop.py b/tools/skp/page_sets/skia_wowwiki_desktop.py index 55e1714eb4..fcabc2a73a 100644 --- a/tools/skp/page_sets/skia_wowwiki_desktop.py +++ b/tools/skp/page_sets/skia_wowwiki_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class WowWikiDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(WowWikiDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_wowwiki_desktop.json') diff --git a/tools/skp/page_sets/skia_yahooanswers_desktop.py b/tools/skp/page_sets/skia_yahooanswers_desktop.py index 10c7952d61..c86599fd3d 100644 --- a/tools/skp/page_sets/skia_yahooanswers_desktop.py +++ b/tools/skp/page_sets/skia_yahooanswers_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(5) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class YahooAnswersDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(YahooAnswersDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_yahooanswers_desktop.json') diff --git a/tools/skp/page_sets/skia_youtube_desktop.py b/tools/skp/page_sets/skia_youtube_desktop.py index fc9872d315..75ff00bb59 100644 --- a/tools/skp/page_sets/skia_youtube_desktop.py +++ b/tools/skp/page_sets/skia_youtube_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(15) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class YoutubeDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(YoutubeDesktopPageSet, self).__init__( user_agent_type='desktop', archive_data_file='data/skia_youtube_desktop.json') diff --git a/tools/skp/page_sets/skia_youtubetvvideo_desktop.py b/tools/skp/page_sets/skia_youtubetvvideo_desktop.py index 0636347e46..3217087bbf 100644 --- a/tools/skp/page_sets/skia_youtubetvvideo_desktop.py +++ b/tools/skp/page_sets/skia_youtubetvvideo_desktop.py @@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page): action_runner.Wait(10) -class SkiaBuildbotPageSet(page_set_module.PageSet): +class YoutubeTvVideoDesktopPageSet(page_set_module.PageSet): """ Pages designed to represent the median, not highly optimized web """ def __init__(self): - super(SkiaBuildbotPageSet, self).__init__( + super(YoutubeTvVideoDesktopPageSet, self).__init__( user_agent_type='', archive_data_file='data/skia_youtubetvvideo_desktop.json') diff --git a/tools/skp/webpages_playback.py b/tools/skp/webpages_playback.py index 4dfe6fca9a..394e14ea4d 100644 --- a/tools/skp/webpages_playback.py +++ b/tools/skp/webpages_playback.py @@ -73,6 +73,13 @@ LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR = os.path.join( os.path.abspath(os.path.dirname(__file__)), 'page_sets', 'data') TMP_SKP_DIR = tempfile.mkdtemp() +# Location of the credentials.json file and the string that represents missing +# passwords. +CREDENTIALS_FILE_PATH = os.path.join( + os.path.abspath(os.path.dirname(__file__)), 'page_sets', 'data', + 'credentials.json' +) + # Stdout that signifies that a recording has failed. RECORD_FAILURE_MSG = 'The recording has not been updated for these pages.' @@ -94,6 +101,9 @@ RETRY_RECORD_WPR_COUNT = 5 # How many times the run_benchmark binary should be retried. RETRY_RUN_MEASUREMENT_COUNT = 5 +# Location of the credentials.json file in Google Storage. +CREDENTIALS_GS_PATH = '/playback/credentials/credentials.json' + X11_DISPLAY = os.getenv('DISPLAY', ':0') GS_PREDEFINED_ACL = gs_utils.GSUtils.PredefinedACL.PRIVATE @@ -154,6 +164,26 @@ class SkPicturePlayback(object): def Run(self): """Run the SkPicturePlayback BuildStep.""" + # Download the credentials file if it was not previously downloaded. + if self._skip_all_gs_access: + print """\n\nPlease create a %s file that contains: + { + "google": { + "username": "google_testing_account_username", + "password": "google_testing_account_password" + }, + "facebook": { + "username": "facebook_testing_account_username", + "password": "facebook_testing_account_password" + } + }\n\n""" % CREDENTIALS_FILE_PATH + raw_input("Please press a key when you are ready to proceed...") + elif not os.path.isfile(CREDENTIALS_FILE_PATH): + # Download the credentials.json file from Google Storage. + gs_bucket = self._dest_gsbase.lstrip(gs_utils.GS_PREFIX) + gs_utils.GSUtils().download_file(gs_bucket, CREDENTIALS_GS_PATH, + CREDENTIALS_FILE_PATH) + # Delete any left over data files in the data directory. for archive_file in glob.glob( os.path.join(LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR, 'skia_*')): @@ -204,7 +234,9 @@ class SkPicturePlayback(object): self._DownloadWebpagesArchive(wpr_data_file, page_set_basename) page_set_name = os.path.basename(page_set).split('.')[0] + page_set_dir = os.path.dirname(page_set) run_benchmark_cmd = ( + 'PYTHONPATH=%s:$PYTHONPATH' % page_set_dir, 'DISPLAY=%s' % X11_DISPLAY, 'timeout', '300', os.path.join(self._telemetry_binaries_dir, 'run_benchmark'), @@ -212,30 +244,11 @@ class SkPicturePlayback(object): '--browser=exact', '--browser-executable=%s' % self._browser_executable, SKP_BENCHMARK, - page_set_name, - '-o', - '/tmp/test.skp', - '--skp-outdir=%s' % TMP_SKP_DIR + '--page-set-name=%s' % page_set_name, + '--page-set-base-dir=%s' % page_set_dir, + '--skp-outdir=%s' % TMP_SKP_DIR, + '--also-run-disabled-tests' ) - page_set_dst = os.path.join(self._telemetry_binaries_dir, 'page_sets', - os.path.basename(page_set)) - wpr_dst = os.path.join(self._telemetry_binaries_dir, 'page_sets', 'data', - wpr_data_file) - json_dst = os.path.join(self._telemetry_binaries_dir, 'page_sets', 'data', - page_set_basename) - copied_page_set = False - if not os.path.exists(page_set_dst): - print 'Copying %s to %s' % (page_set, page_set_dst) - shutil.copyfile(page_set, page_set_dst) - wpr_src = os.path.join(os.path.dirname(page_set), 'data', - wpr_data_file) - print 'Copying %s to %s' % (wpr_src, wpr_dst) - shutil.copyfile(wpr_src, wpr_dst) - json_src = os.path.join(os.path.dirname(page_set), 'data', - page_set_basename) - print 'Copying %s to %s' % (json_src, json_dst) - shutil.copyfile(json_src, json_dst) - copied_page_set = True for _ in range(RETRY_RUN_MEASUREMENT_COUNT): try: @@ -268,19 +281,10 @@ class SkPicturePlayback(object): print '\n\n=======Retrying %s=======\n\n' % page_set time.sleep(10) else: - if copied_page_set: - os.remove(page_set_dst) - os.remove(wpr_dst) - os.remove(json_dst) # If we get here then run_benchmark did not succeed and thus did not # break out of the loop. raise Exception('run_benchmark failed for page_set: %s' % page_set) - if copied_page_set: - os.remove(page_set_dst) - os.remove(wpr_dst) - os.remove(json_dst) - print '\n\n=======Capturing SKP files took %s seconds=======\n\n' % ( time.time() - start_time) |