# HG changeset patch # User Augie Fackler <au...@google.com> # Date 1476002222 14400 # Sun Oct 09 04:37:02 2016 -0400 # Node ID 932b47efd29bab6270d5aca81a24891380c93629 # Parent 340c57968bc1a37877df68c3ce5105a590129715 test-clone: discard lock-related messages
We can't predict where those will show up and they're not super-important for the contents of this particular test, so just drop them. Further reduces the flakiness of the test to zero. diff --git a/tests/test-clone.t b/tests/test-clone.t --- a/tests/test-clone.t +++ b/tests/test-clone.t @@ -1065,7 +1065,7 @@ don't care which is which, so we just ma one containing "new pooled" first, then one one containing "existing pooled". - $ grep 'new pooled' race1.log > /dev/null && cat race1.log || cat race2.log + $ (grep 'new pooled' race1.log > /dev/null && cat race1.log || cat race2.log) | grep -v lock (sharing from new pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1) requesting all changes adding changesets @@ -1078,10 +1078,8 @@ pooled". updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ grep 'existing pooled' race1.log > /dev/null && cat race1.log || cat race2.log + $ (grep 'existing pooled' race1.log > /dev/null && cat race1.log || cat race2.log) | grep -v lock (sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1) - waiting for lock on repository share-destrace2 held by * (glob) - got lock after \d+ seconds (re) searching for changes no changes found adding remote bookmark bookA _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel