From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 6650C1F49B for ; Fri, 27 Mar 2020 00:49:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727685AbgC0AtK (ORCPT ); Thu, 26 Mar 2020 20:49:10 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:38834 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726067AbgC0AtJ (ORCPT ); Thu, 26 Mar 2020 20:49:09 -0400 Received: by mail-wr1-f68.google.com with SMTP id s1so9468009wrv.5 for ; Thu, 26 Mar 2020 17:49:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=Qyv7zF5hcZg/DzLYC2a8W4SsgN0Hb1faAJoIvnhgBzs=; b=SpTq9zwENXZGjfUpms5YF/SNKRsfGAsk7WNCWNnlL6QcneFwadPViPdzh9IecOOH0C zPEIAxUJ9BTWQoIxRuO1i9teaBh49Vc3zm1/U3fUNCXzRZ6DhY1zDh2ayL1fBGE3184X XgBnz53ylut63dO5F+Fd/bbsjy/CArGa4E7fMOeaLjn5tGByCBesnyImogZqEa4eIChB vxlOZABc2NQqNC0elIMrrmrObwt/DI58u7Rf+PU9PqfZinzWmykAy5KvKrAjF1CdD6Ay /AAFlIZY45XxeMEOBMsyLhzgjqLc9+mGMyR2JHM+E0HyKTGxwTHkgU6BSfl0tCGyjnU/ IsPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=Qyv7zF5hcZg/DzLYC2a8W4SsgN0Hb1faAJoIvnhgBzs=; b=HldndtXIYcKn3wgx3llLGO7EBn1ajmoPHLKvqolCpS89jlDQIWIc/2tbXyyEQJGxnJ Pd+gtS0f+/+fJ2CFptiKJCQDLiRklTfqbNk+TQQXRz5ciPS6RkQEE3rT+FwQWXSYh3IN WdaOivdSQOWfgLuGmOPUoSLwt5BWsPlmO8XHpEAjnZKb30aNTJiWkM7Pl3oWx1jh53uZ dQ/MmPTvmuH1qYELPQTPaCaRBBuTvrRMc+slY6798RRKVKdcjLyIsw9Rx3zA4iGTwpQL rfqgLPa8+PyAB/oAy+tGb3KkizdsFplFj3UMtBWEwpQfF2kxyNXLvJ4B3M7ABFFHoSq8 9hHA== X-Gm-Message-State: ANhLgQ3z2yDqyqiBb5pbfeSstC7tTUKQLWjq7TertavH+u3l+radqwAf V4GRNRYs6yNumswEvRIoJHYODVy4 X-Google-Smtp-Source: ADFU+vs+iwY9Jp4CX5EeRLPOyX8D0Fihx98QqQ2HpVXoXbi+b0QvnQ/ckWF+n1TB221jrasrmZFTnw== X-Received: by 2002:adf:ea84:: with SMTP id s4mr12835399wrm.392.1585270147109; Thu, 26 Mar 2020 17:49:07 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id b11sm5890811wrq.26.2020.03.26.17.49.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2020 17:49:06 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Fri, 27 Mar 2020 00:48:48 +0000 Subject: [PATCH v3 05/18] t1091: make some tests a little more defensive against failures Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Derrick Stolee , Elijah Newren , Elijah Newren Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren Reviewed-by: Derrick Stolee Signed-off-by: Elijah Newren --- t/t1091-sparse-checkout-builtin.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh index 44a91205d60..8607a8e6d1a 100755 --- a/t/t1091-sparse-checkout-builtin.sh +++ b/t/t1091-sparse-checkout-builtin.sh @@ -278,6 +278,7 @@ test_expect_success 'cone mode: add parent path' ' ' test_expect_success 'revert to old sparse-checkout on bad update' ' + test_when_finished git -C repo sparse-checkout disable && test_when_finished git -C repo reset --hard && git -C repo sparse-checkout set deep && echo update >repo/deep/deeper2/a && @@ -328,6 +329,7 @@ test_expect_success 'sparse-checkout (init|set|disable) fails with dirty status' ' test_expect_success 'cone mode: set with core.ignoreCase=true' ' + rm repo/.git/info/sparse-checkout && git -C repo sparse-checkout init --cone && git -C repo -c core.ignoreCase=true sparse-checkout set folder1 && cat >expect <<-\EOF && -- gitgitgadget