Patchwork [4,of,5,chg-tests-fix,V2] tests: conditionalize output in test-ssh.t with chg+py3

login
register
mail settings
Submitter Pulkit Goyal
Date Dec. 8, 2020, 1:42 p.m.
Message ID <fa86da45f79d6e89860b.1607434943@DESKTOP-STQPTJK>
Download mbox | patch
Permalink /patch/47838/
State New
Headers show

Comments

Pulkit Goyal - Dec. 8, 2020, 1:42 p.m.
# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1606899465 -19800
#      Wed Dec 02 14:27:45 2020 +0530
# Node ID fa86da45f79d6e89860b4fc7026246811b2b221d
# Parent  4e205264bac2080164e47137dbf991f09aa0f157
# EXP-Topic chg-test
tests: conditionalize output in test-ssh.t with chg+py3

Because of our wrapping around sys.std* and python3 internal buffering, the
output order changes. The change in order seems like harmless because just few
lines above the same command is run which results in same output.

This makes `test-ssh.t` works with --chg on python 3.

Differential Revision: https://phab.mercurial-scm.org/D9502

Patch

diff -r 4e205264bac2 -r fa86da45f79d tests/test-ssh.t
--- a/tests/test-ssh.t	Wed Dec 02 14:19:09 2020 +0530
+++ b/tests/test-ssh.t	Wed Dec 02 14:27:45 2020 +0530
@@ -331,9 +331,10 @@ 
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
+  remote: added 1 changesets with 1 changes to 1 files (py3 !)
   remote: KABOOM
   remote: KABOOM IN PROCESS
-  remote: added 1 changesets with 1 changes to 1 files
+  remote: added 1 changesets with 1 changes to 1 files (no-py3 !)
 
 #endif