build/android/pylib/uiautomator/test_runner.py - Issue 732423002: Update from chromium https://crrev.com/304586

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/pylib/uiautomator/test_runner.py

Issue 732423002: Update from chromium https://crrev.com/304586 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: build/android/pylib/uiautomator/test_runner.py

diff --git a/build/android/pylib/uiautomator/test_runner.py b/build/android/pylib/uiautomator/test_runner.py

index f4e573063d3b53c0348651767557959b5845b41e..c7239b436346fc34feb441426e0e662231d3b920 100644

--- a/build/android/pylib/uiautomator/test_runner.py

+++ b/build/android/pylib/uiautomator/test_runner.py

@@ -63,7 +63,8 @@ class TestRunner(instr_test_runner.TestRunner):

def _RunTest(self, test, timeout):

self.device.ClearApplicationState(self._package)

if self.flags:

- if 'Feature:FirstRunExperience' in self.test_pkg.GetTestAnnotations(test):

+ annotations = self.test_pkg.GetTestAnnotations(test)

+ if ('FirstRunExperience' == annotations(test).get('Feature', None)):

self.flags.RemoveFlags(['--disable-fre'])

else:

self.flags.AddFlags(['--disable-fre'])