# HG changeset patch # User Marti Raudsepp # Date 2009-05-16 23:16:56 # Node ID e1f4343db7402f6e17be2ccb8bcc62bcb7dfb717 # Parent 0a06ae261392440489e087db72f334572f15c426 tests: use repr.py to avoid binary characters in test output diff --git a/tests/test-hgweb-commands b/tests/test-hgweb-commands --- a/tests/test-hgweb-commands +++ b/tests/test-hgweb-commands @@ -49,7 +49,8 @@ echo % lookup echo % branches "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=branches' echo % changegroup -"$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=changegroup' +"$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=changegroup' \ + | $TESTDIR/repr.py echo % stream_out "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=stream_out' echo % failing unbundle, requires POST request diff --git a/tests/test-hgweb-commands.out b/tests/test-hgweb-commands.out index d25fe897d40f628adc63cf9c5f0182f7db1d09a3..ef783c438566071c48d18cf7be5c4ff60fddeed9 GIT binary patch literal 30382 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 binary-local python simplemerge -p binary-local base other echo '% binary file --text' -python simplemerge -a -p binary-local base other +python simplemerge -a -p binary-local base other 2>&1 | $TESTDIR/repr.py echo '% help' python simplemerge --help diff --git a/tests/test-simplemerge-cmd.out b/tests/test-simplemerge-cmd.out index b46c9e5892d59141508c642a79ff6e01b14e80f2..7eab44e2fcf1a346b11ff97aa4ec0028fa95fea7 GIT binary patch literal 2560 zc%1E(O^?$s5Qgvh6?4grtQL+HAa&7794Zyjy#WU&nIu*n+iOoq!>?y-C)@4^Y&meN zPw99*p7FePbErC@Td7-6rV98U-Wj(qU!4Fl1SYw^V?W`0YGeaG^EC=hPrVvU7 zJk@5P=Uyr8>U1NA%IHSPihMG>PwT;4Bxh|1Qj!m8%_%>ob#zZ=)O9urrx|E&l*SPU2n|N73B1KhHWScjW|t6EN-f+34bNtYNTxIcR+8C!P;!qT zPMx2`@=ys6bmTlU$@jzc^$Q~JP}$7O-YQJu`L_LXxBCH`?WgqyZq~b7*xr4<{hDRK zYZo1XI)_+{VkSy~14$)mf>Bb(#b?<;gMtRfR}JYZC0Sd`hs2jE)nJfxOVNYI3cU}| zyxkgToaqw;|Bf7Uj++T;Y{a1G&74MhFh9|aP7~Cuz`JL^`$6J@=Lc&Ujt^@f%gt0J**KhE@kqu0;HK5gQ(shdQPp2n^&8TKOHBX(