Patchwork [1,of,6] test: display pre-pull remote bookmark state when testing race condition

login
register
mail settings
Submitter Pierre-Yves David
Date June 5, 2015, 5:19 a.m.
Message ID <e699ed1229521d06cd57.1433481598@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/9510/
State Accepted
Headers show

Comments

Pierre-Yves David - June 5, 2015, 5:19 a.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1433206469 25200
#      Mon Jun 01 17:54:29 2015 -0700
# Node ID e699ed1229521d06cd575e300faec213c9a7239b
# Parent  51e7acc34b0ab0e540dffdb22127914f2353d5e2
test: display pre-pull remote bookmark state when testing race condition

This makes it easier to read the test. This will be usefull for comming
changesets testing more race conditions.

Patch

diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -272,10 +272,15 @@  update a bookmark in the middle of a cli
   $ cat <<EOF > .hg/hgrc
   > [hooks]
   > outgoing.makecommit = hg ci -Am5; echo committed in pull-race
   > EOF
   $ cd ../pull-race2
+  $ hg -R $TESTTMP/pull-race book
+     @                         1:0d2164f0ce0d
+     X                         1:0d2164f0ce0d
+   * Y                         4:b0a5eff05604
+     Z                         1:0d2164f0ce0d
   $ hg pull
   pulling from $TESTTMP/pull-race (glob)
   searching for changes
   adding f3
   committed in pull-race