Fix ability to capture archives in webpages_playback.py
Updated all page sets to match the file name. This is to make it easier to call record_wpr with the page set class name. Also updated the wait time for baidu to 60 seconds. BUG=skia:3049 Review URL: https://codereview.chromium.org/683473002
This commit is contained in:
rmistry
Commit bot
parent
3dc5d70459
commit
7620bf0658
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class AmazonDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaAmazonDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(AmazonDesktopPageSet, self).__init__(
|
||||
super(SkiaAmazonDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_amazon_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class AndroidPoliceNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaAndroidpoliceNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(AndroidPoliceNexus10PageSet, self).__init__(
|
||||
super(SkiaAndroidpoliceNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_androidpolice_nexus10.json')
|
||||
|
||||
|
||||
@ -23,15 +23,15 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
|
||||
def RunNavigateSteps(self, action_runner):
|
||||
action_runner.NavigateToPage(self)
|
||||
action_runner.Wait(5)
|
||||
action_runner.Wait(60)
|
||||
|
||||
|
||||
class BaiduDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaBaiduDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(BaiduDesktopPageSet, self).__init__(
|
||||
super(SkiaBaiduDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_baidu_desktop.json')
|
||||
|
||||
|
||||
@ -27,12 +27,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(60)
|
||||
|
||||
|
||||
class BloggerDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaBloggerDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(BloggerDesktopPageSet, self).__init__(
|
||||
super(SkiaBloggerDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_blogger_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class BookingDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaBookingDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(BookingDesktopPageSet, self).__init__(
|
||||
super(SkiaBookingDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_booking_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class CarsvgDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaCarsvgDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(CarsvgDesktopPageSet, self).__init__(
|
||||
super(SkiaCarsvgDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_carsvg_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class ChalkboardDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaChalkboardDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(ChalkboardDesktopPageSet, self).__init__(
|
||||
super(SkiaChalkboardDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_chalkboard_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class CnetNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaCnetNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(CnetNexus10PageSet, self).__init__(
|
||||
super(SkiaCnetNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_cnet_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class Css3DesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaCss3gradientsDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(Css3DesktopPageSet, self).__init__(
|
||||
super(SkiaCss3gradientsDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_css3gradients_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class CulturalNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaCulturalsolutionsNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(CulturalNexus10PageSet, self).__init__(
|
||||
super(SkiaCulturalsolutionsNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_culturalsolutions_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class CuteOverloadNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaCuteoverloadNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(CuteOverloadNexus10PageSet, self).__init__(
|
||||
super(SkiaCuteoverloadNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_cuteoverload_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class DeviantartNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaDeviantartNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(DeviantartNexus10PageSet, self).__init__(
|
||||
super(SkiaDeviantartNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_deviantart_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class DiggNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaDiggNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(DiggNexus10PageSet, self).__init__(
|
||||
super(SkiaDiggNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_digg_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class EbayDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaEbayDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(EbayDesktopPageSet, self).__init__(
|
||||
super(SkiaEbayDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_ebay_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class EngadgetNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaEngadgetNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(EngadgetNexus10PageSet, self).__init__(
|
||||
super(SkiaEngadgetNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_engadget_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class EspnDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaEspnDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(EspnDesktopPageSet, self).__init__(
|
||||
super(SkiaEspnDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_espn_desktop.json')
|
||||
|
||||
|
||||
@ -28,12 +28,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class FacebookDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaFacebookDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(FacebookDesktopPageSet, self).__init__(
|
||||
super(SkiaFacebookDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_facebook_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class FontwipeDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaFontwipeDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(FontwipeDesktopPageSet, self).__init__(
|
||||
super(SkiaFontwipeDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_fontwipe_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(20)
|
||||
|
||||
|
||||
class ForecastioDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaForecastioDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(ForecastioDesktopPageSet, self).__init__(
|
||||
super(SkiaForecastioDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_forecastio_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class FrantzenNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaFrantzenNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(FrantzenNexus10PageSet, self).__init__(
|
||||
super(SkiaFrantzenNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_frantzen_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class GamedeksiamNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaGamedeksiamNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(GamedeksiamNexus10PageSet, self).__init__(
|
||||
super(SkiaGamedeksiamNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_gamedeksiam_nexus10.json')
|
||||
|
||||
|
||||
@ -27,12 +27,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(10)
|
||||
|
||||
|
||||
class GmailNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaGmailNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(GmailNexus10PageSet, self).__init__(
|
||||
super(SkiaGmailNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_gmail_nexus10.json')
|
||||
|
||||
|
||||
@ -27,12 +27,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(60)
|
||||
|
||||
|
||||
class GmailthreadDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaGmailthreadDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(GmailthreadDesktopPageSet, self).__init__(
|
||||
super(SkiaGmailthreadDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_gmailthread_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class GoogleblogNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaGoogleblogNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(GoogleblogNexus10PageSet, self).__init__(
|
||||
super(SkiaGoogleblogNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_googleblog_nexus10.json')
|
||||
|
||||
|
||||
@ -27,12 +27,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class GoogleCalendarNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaGooglecalendarNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(GoogleCalendarNexus10PageSet, self).__init__(
|
||||
super(SkiaGooglecalendarNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_googlecalendar_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class GooglehomeDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaGooglehomeDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(GooglehomeDesktopPageSet, self).__init__(
|
||||
super(SkiaGooglehomeDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_googlehome_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class GooglePlusDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaGoogleplusDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(GooglePlusDesktopPageSet, self).__init__(
|
||||
super(SkiaGoogleplusDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_googleplus_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(10)
|
||||
|
||||
|
||||
class GoogleSpreadsheetDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaGooglespreadsheetDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(GoogleSpreadsheetDesktopPageSet, self).__init__(
|
||||
super(SkiaGooglespreadsheetDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_googlespreadsheet_desktop.json')
|
||||
|
||||
|
||||
@ -27,12 +27,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(10)
|
||||
|
||||
|
||||
class GoogleSpreadsheetDashedDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaGooglespreadsheetdashedDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(GoogleSpreadsheetDashedDesktopPageSet, self).__init__(
|
||||
super(SkiaGooglespreadsheetdashedDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_googlespreadsheetdashed_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class GsproNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaGsproNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(GsproNexus10PageSet, self).__init__(
|
||||
super(SkiaGsproNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_gspro_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class GwsDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaGwsDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(GwsDesktopPageSet, self).__init__(
|
||||
super(SkiaGwsDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_gws_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class HsfiNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaHsfiNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(HsfiNexus10PageSet, self).__init__(
|
||||
super(SkiaHsfiNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_hsfi_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(10)
|
||||
|
||||
|
||||
class JsfiddleBigcarDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaJsfiddlebigcarDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(JsfiddleBigcarDesktopPageSet, self).__init__(
|
||||
super(SkiaJsfiddlebigcarDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_jsfiddlebigcar_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(10)
|
||||
|
||||
|
||||
class JsfiddleHumperDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaJsfiddlehumperclipDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(JsfiddleHumperDesktopPageSet, self).__init__(
|
||||
super(SkiaJsfiddlehumperclipDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_jsfiddlehumperclip_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class LinkedinDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaLinkedinDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(LinkedinDesktopPageSet, self).__init__(
|
||||
super(SkiaLinkedinDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_linkedin_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(10)
|
||||
|
||||
|
||||
class MapsvgDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaMapsvgDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(MapsvgDesktopPageSet, self).__init__(
|
||||
super(SkiaMapsvgDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_mapsvg_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class MercurynewsNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaMercurynewsNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(MercurynewsNexus10PageSet, self).__init__(
|
||||
super(SkiaMercurynewsNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_mercurynews_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class MlbNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaMlbNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(MlbNexus10PageSet, self).__init__(
|
||||
super(SkiaMlbNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_mlb_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(10)
|
||||
|
||||
|
||||
class MobilenewsDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaMobilenewsDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(MobilenewsDesktopPageSet, self).__init__(
|
||||
super(SkiaMobilenewsDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_mobilenews_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class MozillaNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaMozillaNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(MozillaNexus10PageSet, self).__init__(
|
||||
super(SkiaMozillaNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_mozilla_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class NofoloNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaNofoloNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(NofoloNexus10PageSet, self).__init__(
|
||||
super(SkiaNofoloNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_nofolo_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class NytimesNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaNytimesNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(NytimesNexus10PageSet, self).__init__(
|
||||
super(SkiaNytimesNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_nytimes_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class OldinboxappDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaOldinboxappDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(OldinboxappDesktopPageSet, self).__init__(
|
||||
super(SkiaOldinboxappDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_oldinboxapp_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class PinterestDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaPinterestDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(PinterestDesktopPageSet, self).__init__(
|
||||
super(SkiaPinterestDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_pinterest_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class PokemonwikiDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaPokemonwikiDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(PokemonwikiDesktopPageSet, self).__init__(
|
||||
super(SkiaPokemonwikiDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_pokemonwiki_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(10)
|
||||
|
||||
|
||||
class PravdaNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaPravdaNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(PravdaNexus10PageSet, self).__init__(
|
||||
super(SkiaPravdaNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_pravda_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class RectangletransitionDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaRectangletransitionDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(RectangletransitionDesktopPageSet, self).__init__(
|
||||
super(SkiaRectangletransitionDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_rectangletransition_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class SahadanNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaSahadanNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(SahadanNexus10PageSet, self).__init__(
|
||||
super(SkiaSahadanNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_sahadan_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class SamoasvgDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaSamoasvgDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(SamoasvgDesktopPageSet, self).__init__(
|
||||
super(SkiaSamoasvgDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_samoasvg_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class SfgateDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaSfgateDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(SfgateDesktopPageSet, self).__init__(
|
||||
super(SkiaSfgateDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_sfgate_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class SlashdotNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaSlashdotNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(SlashdotNexus10PageSet, self).__init__(
|
||||
super(SkiaSlashdotNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_slashdot_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class TechmemeNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaTechmemeNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(TechmemeNexus10PageSet, self).__init__(
|
||||
super(SkiaTechmemeNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_techmeme_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class TigersvgDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaTigersvgDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(TigersvgDesktopPageSet, self).__init__(
|
||||
super(SkiaTigersvgDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_tigersvg_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class TwitterDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaTwitterDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(TwitterDesktopPageSet, self).__init__(
|
||||
super(SkiaTwitterDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_twitter_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class UkwsjNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaUkwsjNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(UkwsjNexus10PageSet, self).__init__(
|
||||
super(SkiaUkwsjNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_ukwsj_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class VnexpressNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaVnexpressNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(VnexpressNexus10PageSet, self).__init__(
|
||||
super(SkiaVnexpressNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_vnexpress_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class WeatherDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaWeatherDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(WeatherDesktopPageSet, self).__init__(
|
||||
super(SkiaWeatherDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_weather_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class WikipediaGalaxynexusPageSet(page_set_module.PageSet):
|
||||
class SkiaWikipediaGalaxynexusPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(WikipediaGalaxynexusPageSet, self).__init__(
|
||||
super(SkiaWikipediaGalaxynexusPageSet, self).__init__(
|
||||
user_agent_type='mobile',
|
||||
archive_data_file='data/skia_wikipedia_galaxynexus.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class WorldjournalNexus10PageSet(page_set_module.PageSet):
|
||||
class SkiaWorldjournalNexus10PageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(WorldjournalNexus10PageSet, self).__init__(
|
||||
super(SkiaWorldjournalNexus10PageSet, self).__init__(
|
||||
user_agent_type='tablet',
|
||||
archive_data_file='data/skia_worldjournal_nexus10.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class WowWikiDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaWowwikiDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(WowWikiDesktopPageSet, self).__init__(
|
||||
super(SkiaWowwikiDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_wowwiki_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(5)
|
||||
|
||||
|
||||
class YahooAnswersDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaYahooanswersDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(YahooAnswersDesktopPageSet, self).__init__(
|
||||
super(SkiaYahooanswersDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_yahooanswers_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(15)
|
||||
|
||||
|
||||
class YoutubeDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaYoutubeDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(YoutubeDesktopPageSet, self).__init__(
|
||||
super(SkiaYoutubeDesktopPageSet, self).__init__(
|
||||
user_agent_type='desktop',
|
||||
archive_data_file='data/skia_youtube_desktop.json')
|
||||
|
||||
|
||||
@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
|
||||
action_runner.Wait(10)
|
||||
|
||||
|
||||
class YoutubeTvVideoDesktopPageSet(page_set_module.PageSet):
|
||||
class SkiaYoutubetvvideoDesktopPageSet(page_set_module.PageSet):
|
||||
|
||||
""" Pages designed to represent the median, not highly optimized web """
|
||||
|
||||
def __init__(self):
|
||||
super(YoutubeTvVideoDesktopPageSet, self).__init__(
|
||||
super(SkiaYoutubetvvideoDesktopPageSet, self).__init__(
|
||||
user_agent_type='',
|
||||
archive_data_file='data/skia_youtubetvvideo_desktop.json')
|
||||
|
||||
|
||||
@ -202,19 +202,23 @@ class SkPicturePlayback(object):
|
||||
# Loop through all page_sets.
|
||||
for page_set in self._page_sets:
|
||||
|
||||
page_set_basename = os.path.basename(page_set).split('.')[0] + '.json'
|
||||
page_set_basename = os.path.basename(page_set).split('.')[0]
|
||||
page_set_json_name = page_set_basename + '.json'
|
||||
wpr_data_file = page_set.split(os.path.sep)[-1].split('.')[0] + '_000.wpr'
|
||||
page_set_dir = os.path.dirname(page_set)
|
||||
|
||||
if self._record:
|
||||
# Create an archive of the specified webpages if '--record=True' is
|
||||
# specified.
|
||||
record_wpr_cmd = (
|
||||
'PYTHONPATH=%s:$PYTHONPATH' % page_set_dir,
|
||||
'DISPLAY=%s' % X11_DISPLAY,
|
||||
os.path.join(self._telemetry_binaries_dir, 'record_wpr'),
|
||||
'--extra-browser-args=--disable-setuid-sandbox',
|
||||
'--browser=exact',
|
||||
'--browser-executable=%s' % self._browser_executable,
|
||||
page_set
|
||||
'%s_page_set' % page_set_basename,
|
||||
'--page-set-base-dir=%s' % page_set_dir
|
||||
)
|
||||
for _ in range(RETRY_RECORD_WPR_COUNT):
|
||||
output = shell_utils.run(' '.join(record_wpr_cmd), shell=True)
|
||||
@ -231,10 +235,8 @@ class SkPicturePlayback(object):
|
||||
else:
|
||||
if not self._skip_all_gs_access:
|
||||
# Get the webpages archive so that it can be replayed.
|
||||
self._DownloadWebpagesArchive(wpr_data_file, page_set_basename)
|
||||
self._DownloadWebpagesArchive(wpr_data_file, page_set_json_name)
|
||||
|
||||
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,
|
||||
@ -244,7 +246,7 @@ class SkPicturePlayback(object):
|
||||
'--browser=exact',
|
||||
'--browser-executable=%s' % self._browser_executable,
|
||||
SKP_BENCHMARK,
|
||||
'--page-set-name=%s' % page_set_name,
|
||||
'--page-set-name=%s' % page_set_basename,
|
||||
'--page-set-base-dir=%s' % page_set_dir,
|
||||
'--skp-outdir=%s' % TMP_SKP_DIR,
|
||||
'--also-run-disabled-tests'
|
||||
@ -267,7 +269,7 @@ class SkPicturePlayback(object):
|
||||
self._local_record_webpages_archive_dir)
|
||||
shutil.move(
|
||||
os.path.join(LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR,
|
||||
page_set_basename),
|
||||
page_set_json_name),
|
||||
self._local_record_webpages_archive_dir)
|
||||
|
||||
# Rename generated SKP files into more descriptive names.
|
||||
@ -375,13 +377,13 @@ class SkPicturePlayback(object):
|
||||
shutil.rmtree(d)
|
||||
os.makedirs(d)
|
||||
|
||||
def _DownloadWebpagesArchive(self, wpr_data_file, page_set_basename):
|
||||
def _DownloadWebpagesArchive(self, wpr_data_file, page_set_json_name):
|
||||
"""Downloads the webpages archive and its required page set from GS."""
|
||||
wpr_source = posixpath.join(ROOT_PLAYBACK_DIR_NAME, 'webpages_archive',
|
||||
wpr_data_file)
|
||||
page_set_source = posixpath.join(ROOT_PLAYBACK_DIR_NAME,
|
||||
'webpages_archive',
|
||||
page_set_basename)
|
||||
page_set_json_name)
|
||||
gs = gs_utils.GSUtils()
|
||||
gs_bucket = self._dest_gsbase.lstrip(gs_utils.GS_PREFIX)
|
||||
if (gs.does_storage_object_exist(gs_bucket, wpr_source) and
|
||||
@ -391,7 +393,7 @@ class SkPicturePlayback(object):
|
||||
wpr_data_file))
|
||||
gs.download_file(gs_bucket, page_set_source,
|
||||
os.path.join(LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR,
|
||||
page_set_basename))
|
||||
page_set_json_name))
|
||||
else:
|
||||
raise Exception('%s and %s do not exist in Google Storage!' % (
|
||||
wpr_source, page_set_source))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user