build/android/pylib/uiautomator/test_runner.py - Issue 17004003: [Android] Fix uiautomator test runner after r206096

Side by Side Diff

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

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

Side by Side Diff: build/android/pylib/uiautomator/test_runner.py

Issue 17004003: [Android] Fix uiautomator test runner after r206096 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 6 months ago

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

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 """Class for running uiautomator tests on a single device."""	5 """Class for running uiautomator tests on a single device."""

6	6

7 from pylib.instrumentation import test_runner as instr_test_runner	7 from pylib.instrumentation import test_runner as instr_test_runner

8	8

9	9

10 class TestRunner(instr_test_runner.TestRunner):	10 class TestRunner(instr_test_runner.TestRunner):

(...skipping 11 matching lines...) Expand all Loading...
22 super(TestRunner, self).__init__(	22 super(TestRunner, self).__init__(

23 options, device, shard_index, test_pkg, ports_to_forward)	23 options, device, shard_index, test_pkg, ports_to_forward)

24	24

25 self.package_name = options.package_name	25 self.package_name = options.package_name

26	26

27 #override	27 #override

28 def InstallTestPackage(self):	28 def InstallTestPackage(self):

29 self.test_pkg.Install(self.adb)	29 self.test_pkg.Install(self.adb)

30	30

31 #override	31 #override

	32 def PushDataDeps(self):

	33 pass

	34

	35 #override

32 def _RunTest(self, test, timeout):	36 def _RunTest(self, test, timeout):

33 self.adb.ClearApplicationState(self.package_name)	37 self.adb.ClearApplicationState(self.package_name)

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

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

36 else:	40 else:

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

38 return self.adb.RunUIAutomatorTest(	42 return self.adb.RunUIAutomatorTest(

39 test, self.test_pkg.GetPackageName(), timeout)	43 test, self.test_pkg.GetPackageName(), timeout)

40	44

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »