pre-upload_unittest: convert mox to mock
We don't want to use mox anymore.
BUG=chromium:430770
TEST=unittests still pass
Change-Id: I5b09f6fcd5760c663c86d7787b8a48ea58605d90
Reviewed-on: https://chromium-review.googlesource.com/233780
Reviewed-by: Yu-Ju Hong <yjhong@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/pre-upload_unittest.py b/pre-upload_unittest.py
index b256895..30c2349 100755
--- a/pre-upload_unittest.py
+++ b/pre-upload_unittest.py
@@ -8,7 +8,6 @@
from __future__ import print_function
-import mox
import os
import sys
@@ -42,29 +41,25 @@
self.assertEquals('\x80', pre_upload._try_utf8_decode('\x80'))
-class CheckNoLongLinesTest(cros_test_lib.MoxTestCase):
+class CheckNoLongLinesTest(cros_test_lib.MockTestCase):
"""Tests for _check_no_long_lines."""
def setUp(self):
- self.mox.StubOutWithMock(pre_upload, '_filter_files')
- self.mox.StubOutWithMock(pre_upload, '_get_affected_files')
- self.mox.StubOutWithMock(pre_upload, '_get_file_diff')
- pre_upload._get_affected_files(mox.IgnoreArg()).AndReturn(['x.py'])
- pre_upload._filter_files(
- ['x.py'], mox.IgnoreArg(), mox.IgnoreArg()).AndReturn(['x.py'])
+ self.PatchObject(pre_upload, '_get_affected_files', return_value=['x.py'])
+ self.PatchObject(pre_upload, '_filter_files', return_value=['x.py'])
+ self.diff_mock = self.PatchObject(pre_upload, '_get_file_diff')
def runTest(self):
- pre_upload._get_file_diff(mox.IgnoreArg(), mox.IgnoreArg()).AndReturn(
- [(1, u"x" * 80), # OK
- (2, "\x80" * 80), # OK
- (3, u"x" * 81), # Too long
- (4, "\x80" * 81), # Too long
- (5, u"See http://" + (u"x" * 80)), # OK (URL)
- (6, u"See https://" + (u"x" * 80)), # OK (URL)
- (7, u"# define " + (u"x" * 80)), # OK (compiler directive)
- (8, u"#define" + (u"x" * 74)), # Too long
- ])
- self.mox.ReplayAll()
+ self.diff_mock.return_value = [
+ (1, u"x" * 80), # OK
+ (2, "\x80" * 80), # OK
+ (3, u"x" * 81), # Too long
+ (4, "\x80" * 81), # Too long
+ (5, u"See http://" + (u"x" * 80)), # OK (URL)
+ (6, u"See https://" + (u"x" * 80)), # OK (URL)
+ (7, u"# define " + (u"x" * 80)), # OK (compiler directive)
+ (8, u"#define" + (u"x" * 74)), # Too long
+ ]
failure = pre_upload._check_no_long_lines('PROJECT', 'COMMIT')
self.assertTrue(failure)
self.assertEquals('Found lines longer than 80 characters (first 5 shown):',
@@ -125,38 +120,35 @@
self.assertFalse(pre_upload._check_project_prefix('PROJECT', 'COMMIT'))
-class CheckKernelConfig(cros_test_lib.MoxTestCase):
+class CheckKernelConfig(cros_test_lib.MockTestCase):
"""Tests for _kernel_configcheck."""
- def runTest(self):
- # Mixed changes, should fail
- self.mox.StubOutWithMock(pre_upload, '_get_affected_files')
- pre_upload._get_affected_files(mox.IgnoreArg()).AndReturn(
- ['/kernel/files/chromeos/config/base.config',
- '/kernel/files/arch/arm/mach-exynos/mach-exynos5-dt.c'
- ])
- self.mox.ReplayAll()
+ def setUp(self):
+ self.file_mock = self.PatchObject(pre_upload, '_get_affected_files')
+
+ def testMixedChanges(self):
+ """Mixing of changes should fail."""
+ self.file_mock.return_value = [
+ '/kernel/files/chromeos/config/base.config',
+ '/kernel/files/arch/arm/mach-exynos/mach-exynos5-dt.c'
+ ]
failure = pre_upload._kernel_configcheck('PROJECT', 'COMMIT')
self.assertTrue(failure)
- # Code-only changes, should pass
- self.mox.UnsetStubs()
- self.mox.StubOutWithMock(pre_upload, '_get_affected_files')
- pre_upload._get_affected_files(mox.IgnoreArg()).AndReturn(
- ['/kernel/files/Makefile',
- '/kernel/files/arch/arm/mach-exynos/mach-exynos5-dt.c'
- ])
- self.mox.ReplayAll()
+ def testCodeOnly(self):
+ """Code-only changes should pass."""
+ self.file_mock.return_value = [
+ '/kernel/files/Makefile',
+ '/kernel/files/arch/arm/mach-exynos/mach-exynos5-dt.c'
+ ]
failure = pre_upload._kernel_configcheck('PROJECT', 'COMMIT')
self.assertFalse(failure)
- # Config-only changes, should pass
- self.mox.UnsetStubs()
- self.mox.StubOutWithMock(pre_upload, '_get_affected_files')
- pre_upload._get_affected_files(mox.IgnoreArg()).AndReturn(
- ['/kernel/files/chromeos/config/base.config',
- ])
- self.mox.ReplayAll()
+ def testConfigOnlyChanges(self):
+ """Config-only changes should pass."""
+ self.file_mock.return_value = [
+ '/kernel/files/chromeos/config/base.config',
+ ]
failure = pre_upload._kernel_configcheck('PROJECT', 'COMMIT')
self.assertFalse(failure)