# HG changeset patch # User Raphaël Gomès # Date 2019-07-23 09:12:36 # Node ID a7f1a0b3f461b38cae5ff5271384d09c146070d0 # Parent 36c692eb28d3eed4178119888a00af6c8d1930af module-policy: update rust extension import to use the new module policy Differential Revision: https://phab.mercurial-scm.org/D6677 diff --git a/tests/test-rust-discovery.py b/tests/test-rust-discovery.py --- a/tests/test-rust-discovery.py +++ b/tests/test-rust-discovery.py @@ -1,16 +1,9 @@ from __future__ import absolute_import import unittest -try: - from mercurial import rustext - rustext.__name__ # trigger immediate actual import -except ImportError: - rustext = None -else: - # this would fail already without appropriate ancestor.__package__ - from mercurial.rustext.discovery import ( - PartialDiscovery, - ) +from mercurial import policy + +PartialDiscovery = policy.importrust('discovery', member='PartialDiscovery') try: from mercurial.cext import parsers as cparsers @@ -39,7 +32,7 @@ data_non_inlined = ( ) -@unittest.skipIf(rustext is None or cparsers is None, +@unittest.skipIf(PartialDiscovery is None or cparsers is None, "rustext or the C Extension parsers module " "discovery relies on is not available") class rustdiscoverytest(unittest.TestCase):