Mercurial > hg
changeset 30121:bbbf6bbbd05f
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.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sun, 09 Oct 2016 04:37:02 -0400 |
| parents | 932faa29b4c1 |
| children | b710dca9937a |
| files | tests/test-clone.t |
| diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-clone.t Sun Oct 09 04:25:22 2016 -0400 +++ b/tests/test-clone.t Sun Oct 09 04:37:02 2016 -0400 @@ -1065,7 +1065,7 @@ 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 @@ 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