On 04/23/2013 12:23 AM, Junio C Hamano wrote:
> Michael Haggerty <mhag...@alum.mit.edu> writes:
> 
>> For now I left the sleeps in t3210.  Given that the problem will be
>> solved by topic jc/prune-all, building a fancier workaround into this
>> test for the old broken --expire behavior seems like a waste of time.
>> I propose that the sleeps be removed when this patch series is merged
>> with jc/prune-all.
> 
> I wouldn't mind to queue this on top of the "prune --expire=all" topic
> at all, especially if that makes the tests easier.

OK then let's do it that way.  The prune-all branch is not risky so I
can't imagine that it will hold up my changes.

If you rebase my patches on top of jc/prune-all, then you can
autosquash this patch to remove the sleeps from

    [PATCH v2 16/33] t3210: test for spurious error messages for dangling 
packed refs

Let me know if you would prefer that I re-roll.

Michael

Signed-off-by: Michael Haggerty <mhag...@alum.mit.edu>
---
 t/t3210-pack-refs.sh | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh
index 559f602..1a2080e 100755
--- a/t/t3210-pack-refs.sh
+++ b/t/t3210-pack-refs.sh
@@ -122,9 +122,8 @@ test_expect_success 'explicit pack-refs with dangling 
packed reference' '
        git commit --allow-empty -m "soon to be garbage-collected" &&
        git pack-refs --all &&
        git reset --hard HEAD^ &&
-       sleep 1 &&
-       git reflog expire --expire=now --all &&
-       git prune --expire=now &&
+       git reflog expire --expire=all --all &&
+       git prune --expire=all &&
        git pack-refs --all 2>result &&
        test_cmp /dev/null result
 '
@@ -135,9 +134,8 @@ test_expect_success 'delete ref with dangling packed 
version' '
        git pack-refs --all &&
        git reset --hard HEAD^ &&
        git checkout master &&
-       sleep 1 &&
-       git reflog expire --expire=now --all &&
-       git prune --expire=now &&
+       git reflog expire --expire=all --all &&
+       git prune --expire=all &&
        git branch -d lamb 2>result &&
        test_cmp /dev/null result
 '
@@ -147,9 +145,8 @@ test_expect_success 'delete ref while another dangling 
packed ref' '
        git commit --allow-empty -m "future garbage" &&
        git pack-refs --all &&
        git reset --hard HEAD^ &&
-       sleep 1 &&
-       git reflog expire --expire=now --all &&
-       git prune --expire=now &&
+       git reflog expire --expire=all --all &&
+       git prune --expire=all &&
        git branch -d lamb 2>result &&
        test_cmp /dev/null result
 '
-- 
1.8.2.1

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to