# HG changeset patch # User Gregory Szorc # Date 1579328667 28800 # Node ID 2928d5af628193e52ccad4530441ade3592696e4 # Parent 6ae32c12b57816f0f89547de3f30e2f1492638ce py3: string normalization and I/O tweaks in test-lfs.t The print was inserting b'' on Python 3. In addition, since we weren't writing to the ui instance (which isn't readily available in this function), output order could get mixed up. We add some pycompat casts and a stdout flush to make the test happy on all Python versions. Differential Revision: https://phab.mercurial-scm.org/D7938 diff -r 6ae32c12b578 -r 2928d5af6281 tests/test-lfs.t --- a/tests/test-lfs.t Fri Jan 17 21:27:53 2020 -0500 +++ b/tests/test-lfs.t Fri Jan 17 22:24:27 2020 -0800 @@ -810,8 +810,11 @@ blob, and the output shows that it isn't fetched. $ cat > $TESTTMP/lfsrename.py < import sys + > > from mercurial import ( > exthelper, + > pycompat, > ) > > from hgext.lfs import ( @@ -829,7 +832,10 @@ > rawtext = self._revlog.rawdata(node) > metadata = pointer.deserialize(rawtext) > print('lfs blob %s renamed %s -> %s' - > % (metadata[b'oid'], ret[0], self._revlog.filename)) + > % (pycompat.sysstr(metadata[b'oid']), + > pycompat.sysstr(ret[0]), + > pycompat.fsdecode(self._revlog.filename))) + > sys.stdout.flush() > return ret > EOF