client/bin/harness_unittest.py - Issue 6539001: Merge remote branch 'cros/upstream' into master.

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: client/bin/harness_unittest.py

Issue 6539001: Merge remote branch 'cros/upstream' into master. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master

Patch Set: patch Created 9 years, 10 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:

Index: client/bin/harness_unittest.py

diff --git a/client/bin/harness_unittest.py b/client/bin/harness_unittest.py

index 908243f9a919d11dfa9e0c0beb5d7a69b4bf171a..a94af5526f7fa1744030447e8525dc053737e132 100755

--- a/client/bin/harness_unittest.py

+++ b/client/bin/harness_unittest.py

@@ -18,8 +18,9 @@ class harness_unittest(unittest.TestCase):

job = object()

self.god.stub_class(harness_standalone, "harness_standalone")

- harness_standalone.harness_standalone.expect_new(job)

- harness.select(None, job)

+ harness_args = ''

+ harness_standalone.harness_standalone.expect_new(job, harness_args)

+ harness.select(None, job, harness_args)

self.god.check_playback()

@@ -27,8 +28,9 @@ class harness_unittest(unittest.TestCase):

job = object()

self.god.stub_class(harness_standalone, "harness_standalone")

- harness_standalone.harness_standalone.expect_new(job)

- harness.select('standalone', job)

+ harness_args = ''

+ harness_standalone.harness_standalone.expect_new(job, harness_args)

+ harness.select('standalone', job, harness_args)

self.god.check_playback()

@@ -36,8 +38,9 @@ class harness_unittest(unittest.TestCase):

job = object()

self.god.stub_class(harness_ABAT, "harness_ABAT")

- harness_ABAT.harness_ABAT.expect_new(job)

- harness.select('ABAT', job)

+ harness_args = ''

+ harness_ABAT.harness_ABAT.expect_new(job, harness_args)

+ harness.select('ABAT', job, harness_args)

self.god.check_playback()

« no previous file with comments | « client/bin/harness_standalone.py ('k') | client/bin/job.py » ('j') | no next file with comments »