[PATCH 5 of 5] test-obsolete: stabilize output on platforms without 'serve' support

Matt Harbison mharbison72 at gmail.com
Sun Jan 8 14:55:43 EST 2017


# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1483904264 18000
#      Sun Jan 08 14:37:44 2017 -0500
# Node ID 85ffb7609d2730d8f602200549040856662e57ee
# Parent  e37bd2d8a98e95e26c506ab00908f718f0e31ac0
test-obsolete: stabilize output on platforms without 'serve' support

The conditional was updating the repository, which wasn't reflected in
subsequent logs on Windows, so the conditional is narrowed to just the serve
commands.  The serve operation generates log files, so those are deleted to keep
the output of summary consistent.

diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -719,8 +719,6 @@
   $ hg debugobsolete -r6 -T '{flag} {get(metadata, "user")}\n'
   0 test
 
-#if serve
-
 Test the debug output for exchange
 ----------------------------------
 
@@ -746,6 +744,8 @@
   $ hg up tip
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
+#if serve
+
   $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
 
@@ -796,6 +796,7 @@
   $ echo '[experimental]' >> $HGRCPATH
   $ echo "evolution=createmarkers,exchange" >> $HGRCPATH
 
+  $ rm hg.pid access.log errors.log
 #endif
 
 Several troubles on the same changeset (create an unstable and bumped changeset)
@@ -833,7 +834,7 @@
   parent: 7:50c51b361e60  (unstable, bumped)
    add babar
   branch: default
-  commit: 3 unknown (clean)
+  commit: (clean)
   update: 2 new changesets (update)
   phases: 4 draft
   unstable: 2 changesets


More information about the Mercurial-devel mailing list