aboutsummaryrefslogtreecommitdiff
path: root/unittests/internaltests.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-08-31 11:07:46 -0700
committerDylan Baker <dylan@pnwbakers.com>2021-08-31 16:59:37 -0700
commitbd691b847c2cb6cbea3450a8749bcc1a67c295e7 (patch)
tree6a2b19d2f8489e57b209116951b54b9fc602aa4a /unittests/internaltests.py
parent042016a5556010b94364fc90280287cf9355c13b (diff)
downloadmeson-bd691b847c2cb6cbea3450a8749bcc1a67c295e7.zip
meson-bd691b847c2cb6cbea3450a8749bcc1a67c295e7.tar.gz
meson-bd691b847c2cb6cbea3450a8749bcc1a67c295e7.tar.bz2
interpreter: use python dunders instead of lock for unpicklability
This simplifies things for us, as we don't have to have threading imported for no other reason, and we can remove the `an_unpicklable_object` from the Interpreter and mesonlib, since there was only one user of this.
Diffstat (limited to 'unittests/internaltests.py')
-rw-r--r--unittests/internaltests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/unittests/internaltests.py b/unittests/internaltests.py
index 0f2af18..8cebeb8 100644
--- a/unittests/internaltests.py
+++ b/unittests/internaltests.py
@@ -1524,6 +1524,6 @@ class InternalTests(unittest.TestCase):
build.environment = mock.Mock()
build.environment.get_source_dir = mock.Mock(return_value='')
with mock.patch('mesonbuild.interpreter.Interpreter._redetect_machines', mock.Mock()), \
- self.assertRaises(Exception):
+ self.assertRaises(mesonbuild.mesonlib.MesonBugException):
i = mesonbuild.interpreter.Interpreter(build, mock=True)
pickle.dumps(i)