>
-------------------------------------------------------------------------- This message, including its attachments, is confidential. For more information please read NNG's email policy here: http://www.nng.com/emailpolicy/ By responding to this email you accept the email policy. -----Original Message----- > From: Mercurial-devel [mailto:mercurial-devel-boun...@mercurial-scm.org] > On Behalf Of timeless > Sent: Friday, August 26, 2016 12:42 AM > To: mercurial-devel@mercurial-scm.org > Subject: [PATCH 1 of 3 v2] tests: skip demandimport if disabled > > # HG changeset patch > # User timeless <timel...@mozdev.org> > # Date 1472162631 0 > # Thu Aug 25 22:03:51 2016 +0000 > # Node ID d240f3e2d0d3f2be06ca5a7b04fa4b6d99e695ff > # Parent b1809f5d7630a3fff0fa715bbd30dba0f07672a8 > # Available At https://bitbucket.org/timeless/mercurial-crew > # hg pull https://bitbucket.org/timeless/mercurial-crew -r > d240f3e2d0d3 > tests: skip demandimport if disabled > > demandimport and setuptools and decorator (from ironpython) and > pygments leads to lots of fail. > > If demandimport is disabled we should skip testing it... > > diff -r b1809f5d7630 -r d240f3e2d0d3 tests/test-demandimport.py > --- a/tests/test-demandimport.pyMon Aug 15 20:39:33 2016 -0700 > +++ b/tests/test-demandimport.pyThu Aug 25 22:03:51 2016 +0000 > @@ -4,6 +4,11 @@ > demandimport.enable() > > import os > + > +# Only run if demandimport is allowed > +if os.environ['HGDEMANDIMPORT'] == 'disable': I would suggest os.environ.get('HGDEMANDIMPORT'). > + exit(80) > + > if os.name != 'nt': > try: > import distutils.msvc9compiler > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel