Patchwork [STABLE] tests: handle Message-Id line wrapping in test-notify-changegroup.t

login
register
mail settings
Submitter Denis Laxalde
Date Nov. 4, 2019, 8:48 a.m.
Message ID <9a43cef9ec59f711f1f6.1572857307@marimba>
Download mbox | patch
Permalink /patch/42704/
State Accepted
Headers show

Comments

Denis Laxalde - Nov. 4, 2019, 8:48 a.m.
# HG changeset patch
# User Denis Laxalde <denis@laxalde.org>
# Date 1572856510 -3600
#      Mon Nov 04 09:35:10 2019 +0100
# Branch stable
# Node ID 9a43cef9ec59f711f1f697430aafd569ca9e2b31
# Parent  579672b347d2169a4abfb372873972a0fd6a839c
tests: handle Message-Id line wrapping in test-notify-changegroup.t

This fixes this test on Python 3 with a long hostname. See changeset
4128ffba4431 for details.
Yuya Nishihara - Nov. 4, 2019, 1:21 p.m.
On Mon, 04 Nov 2019 09:48:27 +0100, Denis Laxalde wrote:
> # HG changeset patch
> # User Denis Laxalde <denis@laxalde.org>
> # Date 1572856510 -3600
> #      Mon Nov 04 09:35:10 2019 +0100
> # Branch stable
> # Node ID 9a43cef9ec59f711f1f697430aafd569ca9e2b31
> # Parent  579672b347d2169a4abfb372873972a0fd6a839c
> tests: handle Message-Id line wrapping in test-notify-changegroup.t

Queued for stable, thanks.

Patch

diff --git a/tests/test-notify-changegroup.t b/tests/test-notify-changegroup.t
--- a/tests/test-notify-changegroup.t
+++ b/tests/test-notify-changegroup.t
@@ -39,6 +39,7 @@  commit
 push
 
   $ hg --traceback --cwd b push ../a 2>&1 |
+  >     "$PYTHON" $TESTDIR/unwrap-message-id.py | \
   >     "$PYTHON" -c 'from __future__ import print_function ; import sys,re; print(re.sub("\n\t", " ", sys.stdin.read()), end="")'
   pushing to ../a
   searching for changes
@@ -93,6 +94,7 @@  unbundle with unrelated source
 unbundle with correct source
 
   $ hg --config notify.sources=unbundle --cwd a unbundle ../test.hg 2>&1 |
+  >     "$PYTHON" $TESTDIR/unwrap-message-id.py | \
   >     "$PYTHON" -c 'from __future__ import print_function ; import sys,re; print(re.sub("\n\t", " ", sys.stdin.read()), end="")'
   adding changesets
   adding manifests
@@ -169,6 +171,7 @@  merge as a different user
 push
 
   $ hg --traceback --cwd b --config notify.fromauthor=True push ../a 2>&1 |
+  >     "$PYTHON" $TESTDIR/unwrap-message-id.py | \
   >     "$PYTHON" -c 'from __future__ import print_function ; import sys,re; print(re.sub("\n\t", " ", sys.stdin.read()), end="")'
   pushing to ../a
   searching for changes