| commit | 166fea00dbfca3f823268bfc08063afa609cae10 | [log] [tgz] |
|---|---|---|
| author | Mike Frysinger <vapier@chromium.org> | Fri Feb 12 05:30:33 2021 -0500 |
| committer | Commit Bot <commit-bot@chromium.org> | Tue May 25 00:28:49 2021 +0000 |
| tree | e2c52949aae0a560b1036cd6d92612c586d2fe8f | |
| parent | 2ec0f1288071fec529bf0e11a0550f0114560cf9 [diff] [blame] |
switch to unittest.mock We've patched Python 3.6 inside the SDK to include the mock fix we need. BUG=b:187789661 TEST=CQ passes Cq-Depend: chromium:2911618 Change-Id: Ib6ba4f9176cf8e121220a3bfe5015dcb5e3d7499 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2910244 Tested-by: Mike Frysinger <vapier@chromium.org> Commit-Queue: Mike Frysinger <vapier@chromium.org> Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
diff --git a/scripts/autotest_quickmerge_unittest.py b/scripts/autotest_quickmerge_unittest.py index c3d0840..5487a89 100644 --- a/scripts/autotest_quickmerge_unittest.py +++ b/scripts/autotest_quickmerge_unittest.py
@@ -4,9 +4,10 @@ """Unit tests for autotest_quickmerge.""" +from unittest import mock + from chromite.lib import cros_test_lib from chromite.scripts import autotest_quickmerge -from chromite.third_party import mock RSYNC_TEST_OUTPUT = """.d..t...... ./