Patchwork tests: update output in test-chg.t as setprocname missing in pure build

login
register
mail settings
Submitter Pulkit Goyal
Date June 19, 2020, 12:12 p.m.
Message ID <87395a4dd915320fc017.1592568732@workspace>
Download mbox | patch
Permalink /patch/46532/
State New
Headers show

Comments

Pulkit Goyal - June 19, 2020, 12:12 p.m.
# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1592396190 -19800
#      Wed Jun 17 17:46:30 2020 +0530
# Node ID 87395a4dd915320fc017ca44e1365def8b5f828f
# Parent  f35562129a6edb5dec21e3121464fe04309eb5f6
# EXP-Topic chg-test
tests: update output in test-chg.t as setprocname missing in pure build

setprocname is not present when we build a pure version. This leads to output
changes in test-chg.t

This should make test suite green on Python 2 pure build with chg.

Differential Revision: https://phab.mercurial-scm.org/D8638
Yuya Nishihara - June 19, 2020, 12:28 p.m.
On Fri, 19 Jun 2020 17:42:12 +0530, Pulkit Goyal wrote:
> # HG changeset patch
> # User Pulkit Goyal <7895pulkit@gmail.com>
> # Date 1592396190 -19800
> #      Wed Jun 17 17:46:30 2020 +0530
> # Node ID 87395a4dd915320fc017ca44e1365def8b5f828f
> # Parent  f35562129a6edb5dec21e3121464fe04309eb5f6
> # EXP-Topic chg-test
> tests: update output in test-chg.t as setprocname missing in pure build
> 
> setprocname is not present when we build a pure version. This leads to output
> changes in test-chg.t

Looks good, but maybe better to add an hghave rule to test if osutil.setprocname
is defined. The #ifdefs in osutil.c isn't simple and the existing (py3 !) rule
isn't always correct.

Patch

diff --git a/tests/test-chg.t b/tests/test-chg.t
--- a/tests/test-chg.t
+++ b/tests/test-chg.t
@@ -229,13 +229,14 @@  check that server events are recorded:
   server.log.1
 
 print only the last 10 lines, since we aren't sure how many records are
-preserved (since setprocname isn't available on py3, the 10th-most-recent line
-is different when using py3):
+preserved (since setprocname isn't available on py3 and pure version,
+the 10th-most-recent line is different when using py3):
 
   $ cat log/server.log.1 log/server.log | tail -10 | filterlog
   YYYY/MM/DD HH:MM:SS (PID)> confighash = ... mtimehash = ... (py3 !)
+  YYYY/MM/DD HH:MM:SS (PID)> confighash = ... mtimehash = ... (pure no-py3 !)
   YYYY/MM/DD HH:MM:SS (PID)> forked worker process (pid=...)
-  YYYY/MM/DD HH:MM:SS (PID)> setprocname: ... (no-py3 !)
+  YYYY/MM/DD HH:MM:SS (PID)> setprocname: ... (no-py3 no-pure !)
   YYYY/MM/DD HH:MM:SS (PID)> received fds: ...
   YYYY/MM/DD HH:MM:SS (PID)> chdir to '$TESTTMP/extreload'
   YYYY/MM/DD HH:MM:SS (PID)> setumask 18