# HG changeset patch # User Augie Fackler <raf@durin42.com> # Date 1395774251 14400 # Tue Mar 25 15:04:11 2014 -0400 # Node ID 51b3b3b4927e876b8815c3f7242b56b189189b13 # Parent 623cb724c3d0636afc376e85c633bcccb793bf8b tests: add some extra filters for new output Tests pass on both my Mac and Linux machine, so I feel moderately confident that this is portable. diff --git a/tests/test-branch-bookmark-suffix.t b/tests/test-branch-bookmark-suffix.t --- a/tests/test-branch-bookmark-suffix.t +++ b/tests/test-branch-bookmark-suffix.t @@ -82,7 +82,7 @@ Cloning into 'gitrepo2'... done. $ cd gitrepo2 - $ git checkout branch1 + $ git checkout branch1 2>&1 | grep -v 'up-to-date' Already on 'branch1' $ echo g1 >> f1 $ git add f1 diff --git a/tests/test-git-submodules.t b/tests/test-git-submodules.t --- a/tests/test-git-submodules.t +++ b/tests/test-git-submodules.t @@ -27,10 +27,10 @@ while older git will use the full normalized path for .) $ clonefilt='s/Cloning into/Initialized empty Git repository in/;s/in .*/in .../' - $ git clone ../gitrepo1 . | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' + $ git clone ../gitrepo1 . 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' Initialized empty Git repository in ... - $ git submodule add ../gitsubrepo subrepo | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' + $ git submodule add ../gitsubrepo subrepo 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' Initialized empty Git repository in ... $ git commit -m 'add subrepo' | sed 's/, 0 deletions(-)//' @@ -48,7 +48,7 @@ [master a000567] change subrepo commit 1 file changed, 1 insertion(+), 1 deletion(-) - $ git submodule add ../gitsubrepo subrepo2 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' + $ git submodule add ../gitsubrepo subrepo2 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' Initialized empty Git repository in ... $ git commit -m 'add another subrepo' | sed 's/, 0 deletions(-)//' @@ -79,7 +79,7 @@ $ git rm alpha rm 'alpha' - $ git submodule add ../gitsubrepo alpha | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' + $ git submodule add ../gitsubrepo alpha 2>&1 | python -c "$rmpwd" | sed "$clonefilt" | egrep -v '^done\.$' Initialized empty Git repository in ... $ git commit -m 'replace file with subrepo' | sed 's/, 0 deletions(-)//' | sed 's/, 0 insertions(+)//' diff --git a/tests/test-subrepos.t b/tests/test-subrepos.t --- a/tests/test-subrepos.t +++ b/tests/test-subrepos.t @@ -28,7 +28,7 @@ $ git config receive.denyCurrentBranch ignore $ cd .. Ensure gitlinks are transformed to .hgsubstate on hg pull from git - $ hg clone gitrepo1 hgrepo + $ hg clone gitrepo1 hgrepo 2>&1 | egrep -v '^(Cloning into|done)' importing git objects into hg updating to branch default cloning subrepo subrepo1 from $TESTTMP/gitsubrepo