tests/gclient_utils_test.py - Issue 177003023: Revert "Re-re-land gclient deletion of mismatching checkouts again"

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: tests/gclient_utils_test.py

Issue 177003023: Revert "Re-re-land gclient deletion of mismatching checkouts again" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 6 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:

View side-by-side diff with in-line comments

Download patch

Index: tests/gclient_utils_test.py

diff --git a/tests/gclient_utils_test.py b/tests/gclient_utils_test.py

index 6be9e1f5f3bdba53d0c0f6c817b2328fb98fc469..b0b74363130c6a9a721704f09ee787d1968bc8c3 100755

--- a/tests/gclient_utils_test.py

+++ b/tests/gclient_utils_test.py

@@ -29,9 +29,7 @@ class GclientUtilsUnittest(GclientUtilBase):

def testMembersChanged(self):

members = [

'Annotated', 'AutoFlush', 'CheckCallAndFilter', 'CommandToStr',

- 'CheckCallAndFilterAndHeader',

- 'enable_deletion_of_conflicting_checkouts', # TODO(borenet): Remove!

- 'Error', 'ExecutionQueue', 'FileRead',

+ 'CheckCallAndFilterAndHeader', 'Error', 'ExecutionQueue', 'FileRead',

'FileWrite', 'FindFileUpwards', 'FindGclientRoot',

'GetGClientRootAndEntries', 'GetEditor', 'GetExeSuffix',

'GetMacWinOrLinux', 'GitFilter', 'IsDateRevision', 'MakeDateRevision',

@@ -41,9 +39,7 @@ class GclientUtilsUnittest(GclientUtilBase):

'GCLIENT_CHILDREN_LOCK', 'GClientChildren', 'SplitUrlRevision',

'SyntaxErrorToError', 'UpgradeToHttps', 'Wrapper', 'WorkItem',

'codecs', 'lockedmethod', 'logging', 'os', 'pipes', 'Queue', 're',

- 'rmtree', 'safe_makedirs', 'safe_rename',

- 'socket', # TODO(borenet): Remove!

- 'stat', 'subprocess',

+ 'rmtree', 'safe_makedirs', 'safe_rename', 'stat', 'subprocess',

'subprocess2', 'sys', 'tempfile', 'threading', 'time', 'urlparse',

]

« no previous file with comments | « tests/gclient_smoketest.py ('k') | tests/scm_unittest.py » ('j') | no next file with comments »