aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-05-13 14:33:40 -0700
committerDylan Baker <dylan@pnwbakers.com>2020-05-14 12:15:03 -0700
commitcb4e4f625f8f191eb5ed1bd435a263b0c7bd11cf (patch)
tree0d015e8a03ef3c903ef5b630b16e071133ded6dc
parentc64715b99a310e031fd145c64b111891861e4ddc (diff)
downloadmeson-cb4e4f625f8f191eb5ed1bd435a263b0c7bd11cf.zip
meson-cb4e4f625f8f191eb5ed1bd435a263b0c7bd11cf.tar.gz
meson-cb4e4f625f8f191eb5ed1bd435a263b0c7bd11cf.tar.bz2
run_unittests: Use unittest.mock instead of a handrolled mock
-rwxr-xr-xrun_unittests.py19
1 files changed, 8 insertions, 11 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 8dde4e5..e088467 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -717,25 +717,22 @@ class InternalTests(unittest.TestCase):
self.assertEqual([1, 2, 3], extract(kwargs, 'sources'))
def test_pkgconfig_module(self):
-
- class Mock:
- pass
-
- dummystate = Mock()
+ dummystate = mock.Mock()
dummystate.subproject = 'dummy'
- mock = Mock()
- mock.pcdep = Mock()
- mock.pcdep.name = "some_name"
- mock.version_reqs = []
+ _mock = mock.Mock(spec=mesonbuild.dependencies.ExternalDependency)
+ _mock.pcdep = mock.Mock()
+ _mock.pcdep.name = "some_name"
+ _mock.version_reqs = []
+ _mock = mock.Mock(held_object=_mock)
# pkgconfig dependency as lib
deps = mesonbuild.modules.pkgconfig.DependenciesHelper(dummystate, "thislib")
- deps.add_pub_libs([mock])
+ deps.add_pub_libs([_mock])
self.assertEqual(deps.format_reqs(deps.pub_reqs), "some_name")
# pkgconfig dependency as requires
deps = mesonbuild.modules.pkgconfig.DependenciesHelper(dummystate, "thislib")
- deps.add_pub_reqs([mock])
+ deps.add_pub_reqs([_mock])
self.assertEqual(deps.format_reqs(deps.pub_reqs), "some_name")
def _test_all_naming(self, cc, env, patterns, platform):