commit 24146be8336f4431e79afd24dee5545a059e4267
author Edward Lemur <ehmaldonado@chromium.org> Thu Aug 01 21:44:52 2019 +0000
committer Commit Bot <commit-bot@chromium.org> Thu Aug 01 21:44:52 2019 +0000
tree 27e6c1919f7cb9ce5e2aec3e8724d8645e4c6c2b
parent 447b45d42307021be3dc11d9e557b59e42f30ef8

depot_tools: Simplify CheckCallAndFilter[AndHeader]

- Merge CheckCallAndFilter[AndHeader]
- print_stdout will cause command output to be redirected to sys.stdout.
- Made compatible with Python 3.

Bug: 984182
Change-Id: Ida30e295b872c8c1a1474a376a90aecea924f307
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1727404
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>

tests/gclient_scm_test.py

diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index 1e99f52..bfb7be7 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -60,8 +60,6 @@
   def setUp(self):
     SuperMoxTestBase.setUp(self)
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'CheckCallAndFilter')
-    self.mox.StubOutWithMock(gclient_scm.gclient_utils,
-        'CheckCallAndFilterAndHeader')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileRead')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'FileWrite')
     self.mox.StubOutWithMock(gclient_scm.gclient_utils, 'rmtree')
@@ -347,7 +345,7 @@
     self.assertEquals(file_list, [file_path])
     self.checkstdout(
         ('\n________ running \'git -c core.quotePath=false diff --name-status '
-         '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\n') %
+         '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\n\nM\ta\n') %
             join(self.root_dir, '.'))
 
   def testStatus2New(self):
@@ -367,8 +365,8 @@
     self.assertEquals(sorted(file_list), expected_file_list)
     self.checkstdout(
         ('\n________ running \'git -c core.quotePath=false diff --name-status '
-         '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\nM\ta\nM\tb\n') %
-            join(self.root_dir, '.'))
+         '069c602044c5388d2d15c3f875b057c852003458\' in \'%s\'\n\nM\ta\nM\tb\n')
+            % join(self.root_dir, '.'))
 
   def testUpdateUpdate(self):
     if not self.enabled:
@@ -1024,8 +1022,7 @@
     self.mox.StubOutWithMock(tempfile, 'mkdtemp')
 
     tempfile.mkdtemp().AndReturn(self._workdir)
-    gclient_scm.gclient_utils.CheckCallAndFilter(
-        cmd, filter_fn=mox.IgnoreArg(), print_stdout=False)
+    gclient_scm.gclient_utils.CheckCallAndFilter(cmd)
     gclient_scm.gclient_utils.rmtree(self._workdir)
 
     self.mox.ReplayAll()