[PATCH 3 of 3] py3: update test-check-py3-compat.t output

[Martijn Pieters]

On 26 November 2016 at 10:52, Yuya Nishihara <yuya at tcha.org> wrote:

> On Mon, 21 Nov 2016 16:26:06 +0530, Pulkit Goyal wrote:
> > # HG changeset patch
> > # User Pulkit Goyal <7895pulkit at gmail.com>
> > # Date 1479722936 -19800
> > #      Mon Nov 21 15:38:56 2016 +0530
> > # Node ID 7717d96973c86d0007a00eb477aabe395d9eb644
> > # Parent  8439604b72091313a46ceac1d03caa1299e610ab
> > py3: update test-check-py3-compat.t output
> >
> > This part remains unchanged because it runs in Python 3 only.
> >
> > diff -r 8439604b7209 -r 7717d96973c8 tests/test-check-py3-compat.t
> > --- a/tests/test-check-py3-compat.t   Mon Nov 21 15:35:22 2016 +0530
> > +++ b/tests/test-check-py3-compat.t   Mon Nov 21 15:38:56 2016 +0530
> > @@ -32,6 +32,9 @@
> >    hgext/fsmonitor/pywatchman/pybser.py: error importing: <ImportError>
> No module named 'pybser' (error at __init__.py:*)
> >    hgext/fsmonitor/watchmanclient.py: error importing: <ImportError> No
> module named 'pybser' (error at __init__.py:*)
> >    hgext/mq.py: error importing: <TypeError> __import__() argument 1
> must be str, not bytes (error at extensions.py:*)
> > +  mercurial/cffi/bdiff.py: error importing: <ImportError> No module
> named 'mercurial.cffi' (error at check-py3-compat.py:*)
> > +  mercurial/cffi/mpatch.py: error importing: <ImportError> No module
> named 'mercurial.cffi' (error at check-py3-compat.py:*)
> > +  mercurial/cffi/osutil.py: error importing: <ImportError> No module
> named 'mercurial.cffi' (error at check-py3-compat.py:*)
>
> Ok, but you'll get a different error if you have cffi installed.
>

Hrm, so how can we best make this conditional?


> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>



-- 
Martijn Pieters
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20161128/7cba45bf/attachment.html>