cros_test_lib: Refactor cros_build_lib mocks
A large number of unit tests import cros_build_lib_unittest to get
access to RunCommandMock and PopenMock. Let's refactor these helper
classes out to start breaking up all the weird dependencies.
BUG=chromium:809634
TEST=unit tests pass
CQ-DEPEND=CL:1060243
Change-Id: I99492246992f27a2fc792651dce0cbf965dbd0ff
Reviewed-on: https://chromium-review.googlesource.com/1045617
Commit-Ready: Benjamin Gordon <bmgordon@chromium.org>
Tested-by: Benjamin Gordon <bmgordon@chromium.org>
Reviewed-by: Benjamin Gordon <bmgordon@chromium.org>
diff --git a/scripts/autotest_quickmerge_unittest.py b/scripts/autotest_quickmerge_unittest.py
index e7968c0..9c09c96 100644
--- a/scripts/autotest_quickmerge_unittest.py
+++ b/scripts/autotest_quickmerge_unittest.py
@@ -10,7 +10,6 @@
import mock
import types
-from chromite.lib import cros_build_lib_unittest
from chromite.lib import cros_test_lib
from chromite.scripts import autotest_quickmerge
@@ -111,7 +110,7 @@
self.assertEqual(set(package_matches), expected_set)
-class RsyncCommandTest(cros_build_lib_unittest.RunCommandTestCase):
+class RsyncCommandTest(cros_test_lib.RunCommandTestCase):
"""Test autotest_quickmerge.RsyncQuickmerge."""
def testRsyncQuickmergeCommand(self):