Patchwork D11227: run-tests: use a small timeout for chg instance

login
register
mail settings
Submitter phabricator
Date July 28, 2021, 2:58 p.m.
Message ID <differential-rev-PHID-DREV-nfzwskqthbrx2t7ghxai-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49541/
State Superseded
Headers show

Comments

phabricator - July 28, 2021, 2:58 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  There is case where the test runner fails to clean up the temporary files in
  that case, spawned chg instance can stay around for 1 hours. Getting them to
  shut down sooner cannot hurt.
  
  (We should also use a more robust approach for this cleanup)

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D11227

AFFECTED FILES
  tests/run-tests.py
  tests/test-basic.t
  tests/test-commandserver.t

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-commandserver.t b/tests/test-commandserver.t
--- a/tests/test-commandserver.t
+++ b/tests/test-commandserver.t
@@ -214,6 +214,7 @@ 
   ...     runcommand(server, [b'-R', b'foo', b'showconfig', b'ui', b'defaults'])
   *** runcommand showconfig
   bundle.mainreporoot=$TESTTMP/repo
+  chgserver.idletimeout=60
   devel.all-warnings=true
   devel.default-date=0 0
   extensions.fsmonitor= (fsmonitor !)
diff --git a/tests/test-basic.t b/tests/test-basic.t
--- a/tests/test-basic.t
+++ b/tests/test-basic.t
@@ -2,6 +2,7 @@ 
 
 #if no-extraextensions
   $ hg config
+  chgserver.idletimeout=60
   devel.all-warnings=true
   devel.default-date=0 0
   extensions.fsmonitor= (fsmonitor !)
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1546,6 +1546,8 @@ 
             hgrc.write(b'mergemarkers = detailed\n')
             hgrc.write(b'promptecho = True\n')
             hgrc.write(b'timeout.warn=15\n')
+            hgrc.write(b'[chgserver]\n')
+            hgrc.write(b'idletimeout=60\n')
             hgrc.write(b'[defaults]\n')
             hgrc.write(b'[devel]\n')
             hgrc.write(b'all-warnings = true\n')