Patchwork [2,of,2] test-clone: discard lock-related messages

login
register
mail settings
Submitter Augie Fackler
Date Oct. 9, 2016, 8:42 a.m.
Message ID <cca6191f741ae9165518.1476002577@augie-macbookair2.roam.corp.google.com>
Download mbox | patch
Permalink /patch/16970/
State Superseded
Headers show

Comments

Augie Fackler - Oct. 9, 2016, 8:42 a.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1476002222 14400
#      Sun Oct 09 04:37:02 2016 -0400
# Node ID cca6191f741ae91655189e3d2b99db2d1284e09f
# Parent  eb00b5d08443c5a5cef981c25def007685ed1fe6
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.

Patch

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 -q 'new pooled' race1.log && cat race1.log || cat race2.log
+  $ (grep -q 'new pooled' race1.log && 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 -q 'existing pooled' race1.log && cat race1.log || cat race2.log
+  $ (grep -q 'existing pooled' race1.log && 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