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=-3.8 required=3.0 tests=AWL,BAYES_00, 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 4802E1F487 for ; Thu, 26 Mar 2020 15:26:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728514AbgCZP0w (ORCPT ); Thu, 26 Mar 2020 11:26:52 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:46602 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728390AbgCZP0v (ORCPT ); Thu, 26 Mar 2020 11:26:51 -0400 Received: by mail-wr1-f67.google.com with SMTP id j17so8243224wru.13 for ; Thu, 26 Mar 2020 08:26:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=DXWiI6dse/XqYrcy5e1qd7ZFWM+ZcCGIvX8T3IfEenU=; b=TNQJmfaWRQcmqS8cSUhgAsWg01wpEPGm5Wm7bQy6Tc12uE0qeBpZmre2yemmv6QnM3 L5fcMQ9xT7zGEDnHzEE4Dum+cM1wJZ+UN8+GrqXi0KrYF6VfxhBG49ha+hnbnqh2h0cm /adjXdQWg/WMv3oonh83QZaXcSg/ELTnfbvdvOb99aCijcf0abKCc/IvTxpNSTNoBGPC LZqUUjYwrAOKWXW+VPjwA45mS2pe64LhY8z23zp22EE/GYw/O7xT3LdotTXt3lGQ726J 1i5DzEJD/eiFMB9YJsK2EQBw5AtnyJvwBSTRNacooXZVgPHf9QY4349hVioGtr153T+a RkzA== X-Gm-Message-State: ANhLgQ3W1GM7VkTMG3bPVlI6+NWT6UWBuDAwlye+K0Ouq7PT30vW5kEk saBoZrfKK05VnmguBGiIcPsSRKGVSZZ627kSE0Y= X-Google-Smtp-Source: ADFU+vuQvm7xBSKYxheEauOgAR9sAI78VJJpKKArKE3UY5LezFigGM15ikfpFrmZ5WBAU+6hyaNpn/ob56JV5/BSY1U= X-Received: by 2002:a05:6000:a:: with SMTP id h10mr10580360wrx.226.1585236410577; Thu, 26 Mar 2020 08:26:50 -0700 (PDT) MIME-Version: 1.0 References: <53e64e7077063a177cfafd97aa01340ee5b4cf1f.1585209554.git.liu.denton@gmail.com> In-Reply-To: <53e64e7077063a177cfafd97aa01340ee5b4cf1f.1585209554.git.liu.denton@gmail.com> From: Eric Sunshine Date: Thu, 26 Mar 2020 11:26:39 -0400 Message-ID: Subject: Re: [PATCH v2 4/8] t5550: simplify no matching line check To: Denton Liu Cc: Git Mailing List , Junio C Hamano Content-Type: text/plain; charset="UTF-8" Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Thu, Mar 26, 2020 at 4:28 AM Denton Liu wrote: > In the 'did not use upload-pack service' test, we have a complicated > song-and-dance to ensure that there are no "/git-upload-pack" lines in > "$HTTPD_ROOT_PATH/access.log". Simplify this by just checking that grep > returns a non-zero exit code. > > Signed-off-by: Denton Liu > --- > diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh > @@ -248,9 +248,7 @@ test_expect_success 'fetch can handle previously-fetched .idx files' ' > test_expect_success 'did not use upload-pack service' ' > - test_might_fail grep '/git-upload-pack' <"$HTTPD_ROOT_PATH"/access.log >act && > - : >exp && > - test_cmp exp act > + ! grep "/git-upload-pack" "$HTTPD_ROOT_PATH/access.log" > ' It would have been nice for the commit message to have mentioned that the change is also eliminating an incorrect application of test_might_fail(), but it's probably not worth a re-roll.