Commit a8ae96e7 authored by tonyg's avatar tonyg Committed by Commit bot

Revert of Re-enable memory tests. Fixed sign-in issue. (patchset #3 of...

Revert of Re-enable memory tests. Fixed sign-in issue. (patchset #3 of https://codereview.chromium.org/491863003/)

Reason for revert:
Failing on bots. Looks like we forgot to commit the archive.

Traceback (most recent call last):
  File "/b/build/slave/Android_Nexus5_Perf/build/src/tools/perf/../telemetry/telemetry/value/failure.py", line 39, in _GetExcInfoFromMessage
    raise Exception(message)
Exception: Page set archive doesn't exist.

http://chromegw/i/chromium.perf/builders/Android%20Nexus5%20Perf/builds/1480/steps/memory.mobile_memory/logs/stdio

Original issue's description:
> Re-enable memory tests. Fixed sign-in issue.
>
> Re-recording other tests may be required.
>
> BUG=370977
>
> Committed: https://chromium.googlesource.com/chromium/src/+/383ffaab6b5fac34b950d9faaab637cc75907aca

TBR=skyostil@chromium.org,starodub@google.com
NOTREECHECKS=true
NOTRY=true
BUG=370977

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

Cr-Commit-Position: refs/heads/master@{#292266}
parent e8c25475
...@@ -7,6 +7,7 @@ import page_sets ...@@ -7,6 +7,7 @@ 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_018.wpr": [ "mobile_memory_017.wpr": [
"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/was-y-combinator-worth-it/",
"https://mail.google.com/mail/mu", "https://mail.google.com/mail/mu",
"https://www.google.com/search?site=&tbm=isch&q=google",
"http://techcrunch.com", "http://techcrunch.com",
"https://www.google.com/search?site=&tbm=isch&q=google" "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/was-y-combinator-worth-it/"
] ]
} }
} }
\ No newline at end of file
...@@ -17,11 +17,7 @@ class GoogleCredentialsBackend( ...@@ -17,11 +17,7 @@ class GoogleCredentialsBackend(
@property @property
def url(self): def url(self):
# pylint: disable=C0301 return 'https://accounts.google.com/'
# 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):
backend = google_credentials_backend.GoogleCredentialsBackend() self._LoginUsingMock(google_credentials_backend.GoogleCredentialsBackend(),
self._LoginUsingMock(backend, backend.url, backend.login_input_id, 'https://accounts.google.com/', 'Email',
backend.password_input_id) 'Passwd')
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