Commit 70362178 authored by starodub's avatar starodub Committed by Commit bot

Re-enable memory tests. Fixed sign-in issue.

Re-recording other tests may be required.

BUG=370977

Review URL: https://codereview.chromium.org/491863003

Cr-Commit-Position: refs/heads/master@{#292168}
parent c411803a
...@@ -7,7 +7,6 @@ import page_sets ...@@ -7,7 +7,6 @@ import page_sets
from telemetry import benchmark from telemetry import benchmark
@benchmark.Disabled('android') # crbug.com/370977
class MemoryMobile(benchmark.Benchmark): class MemoryMobile(benchmark.Benchmark):
test = memory.Memory test = memory.Memory
page_set = page_sets.MobileMemoryPageSet page_set = page_sets.MobileMemoryPageSet
......
{ {
"description": "Describes the Web Page Replay archives for a page set. Don't edit by hand! Use record_wpr for updating.", "description": "Describes the Web Page Replay archives for a page set. Don't edit by hand! Use record_wpr for updating.",
"archives": { "archives": {
"mobile_memory_017.wpr": [ "mobile_memory_018.wpr": [
"https://mail.google.com/mail/mu",
"https://www.google.com/search?site=&tbm=isch&q=google",
"http://techcrunch.com",
"http://techcrunch.com/2014/02/17/pixel-brings-brings-old-school-video-game-art-to-life-in-your-home/", "http://techcrunch.com/2014/02/17/pixel-brings-brings-old-school-video-game-art-to-life-in-your-home/",
"http://techcrunch.com/2014/02/15/kickstarter-coins-2/", "http://techcrunch.com/2014/02/15/kickstarter-coins-2/",
"http://techcrunch.com/2014/02/15/was-y-combinator-worth-it/" "http://techcrunch.com/2014/02/15/was-y-combinator-worth-it/",
"https://mail.google.com/mail/mu",
"http://techcrunch.com",
"https://www.google.com/search?site=&tbm=isch&q=google"
] ]
} }
} }
\ No newline at end of file
...@@ -17,7 +17,11 @@ class GoogleCredentialsBackend( ...@@ -17,7 +17,11 @@ class GoogleCredentialsBackend(
@property @property
def url(self): def url(self):
return 'https://accounts.google.com/' # pylint: disable=C0301
# WPR doesn't support having 2 responses for the same URL (with/without
# session cookie), so after login behaviour differs with/without wpr.
# Sign-in URL is specified directly to overcome this.
return 'https://accounts.google.com/ServiceLogin?continue=https%3A%2F%2Faccounts.google.com%2FManageAccount'
@property @property
def login_form_id(self): def login_form_id(self):
......
...@@ -12,6 +12,6 @@ class TestGoogleCredentialsBackend( ...@@ -12,6 +12,6 @@ class TestGoogleCredentialsBackend(
self._credentials_type = 'google' self._credentials_type = 'google'
def testLoginUsingMock(self): def testLoginUsingMock(self):
self._LoginUsingMock(google_credentials_backend.GoogleCredentialsBackend(), backend = google_credentials_backend.GoogleCredentialsBackend()
'https://accounts.google.com/', 'Email', self._LoginUsingMock(backend, backend.url, backend.login_input_id,
'Passwd') backend.password_input_id)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment