From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 3E5D01F576 for ; Thu, 1 Mar 2018 10:51:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967605AbeCAKvt (ORCPT ); Thu, 1 Mar 2018 05:51:49 -0500 Received: from smtp-out-3.talktalk.net ([62.24.135.67]:54132 "EHLO smtp-out-3.talktalk.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967588AbeCAKvY (ORCPT ); Thu, 1 Mar 2018 05:51:24 -0500 Received: from lindisfarne.localdomain ([92.22.16.137]) by smtp.talktalk.net with SMTP id rLnoeYfgY59cnrLnwexaFp; Thu, 01 Mar 2018 10:51:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=talktalk.net; s=cmr1711; t=1519901476; bh=t1EalJxdhDGW0EtXvC+ie8737VVuchZVG1Ps6AZUfyY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=XzGsKd2zkxMz8vHk5sUaR8ENrUunLkrYHAcKAggqvzfEP8qv6wwMqEEEhjrIPel/4 0gF9bBXg+/ee+dFovxTY13xcck/j77pQzeuHVT8w6vHWXC9h7R5MCRxjj7S/yYuESJ v1FQeBTLj2nqwozcYiYpge4Ob7IancnsPH2DzBfY= X-Originating-IP: [92.22.16.137] X-Spam: 0 X-OAuthority: v=2.3 cv=Yr8hubQX c=1 sm=1 tr=0 a=nWy375ASyxHoIYnPohIYMA==:117 a=nWy375ASyxHoIYnPohIYMA==:17 a=evINK-nbAAAA:8 a=ZreZE-04bYjqTV0VtXMA:9 a=JKJlppc6-rsBzady:21 a=EXMGWyDDmFWXYRiX:21 a=RfR_gqz1fSpA9VikTjo0:22 From: Phillip Wood To: Git Mailing List Cc: Junio C Hamano , "Brian M. Carlson" , Eric Sunshine , Phillip Wood Subject: [PATCH v4 3/9] t3701: use test_write_lines and write_script Date: Thu, 1 Mar 2018 10:50:57 +0000 Message-Id: <20180301105103.24268-4-phillip.wood@talktalk.net> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180301105103.24268-1-phillip.wood@talktalk.net> References: <20180213104408.9887-1-phillip.wood@talktalk.net> <20180301105103.24268-1-phillip.wood@talktalk.net> Reply-To: Phillip Wood X-CMAE-Envelope: MS4wfKSFMI/ThWJT3biNBLltZSxS9gDFo5kfjrujSVOwhVpxlCqtzFRO7KpSi1hlGoS3frA9inEf4gn0HEbr2R3Wzv36OY6ElDqw8zy3uut/+otOALsgG/HP 23JbP9nHXcdddelUie5ybRPwdp5Ge0ZLvD27cBQP0w8zr7U/pLCA1bbBDGYVuFvN8v2Uo5LrR+y1Y4geDfNYLVzD0HFjgnxFmntgbtqWEZv4JytY49IPsR5O R98QtaUJgEMujo0qzkFkmwKz+GvkZyPriyEnGZfkmzXr86NaB5vtmo2yXE2AXZ/6+aID8oRFUr44lr1G2Z1QjOggDvno9+Hdy9BWd0wgzlE= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Phillip Wood Simplify things slightly by using the above helpers. Signed-off-by: Phillip Wood --- Notes: changes since v2 - fixed use of test_set_editor to match what was in pu t/t3701-add-interactive.sh | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 3130dafcf0..836ce346ed 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -87,13 +87,8 @@ test_expect_success 'setup expected' ' EOF ' -test_expect_success 'setup fake editor' ' - >fake_editor.sh && - chmod a+x fake_editor.sh && - test_set_editor "$(pwd)/fake_editor.sh" -' - test_expect_success 'dummy edit works' ' + test_set_editor : && (echo e; echo a) | git add -p && git diff > diff && test_cmp expected diff @@ -110,12 +105,10 @@ test_expect_success 'setup patch' ' ' test_expect_success 'setup fake editor' ' - echo "#!$SHELL_PATH" >fake_editor.sh && - cat >>fake_editor.sh <<-\EOF && + write_script "fake_editor.sh" <<-\EOF && mv -f "$1" oldpatch && mv -f patch "$1" EOF - chmod a+x fake_editor.sh && test_set_editor "$(pwd)/fake_editor.sh" ' @@ -302,18 +295,12 @@ test_expect_success 'deleting an empty file' ' test_expect_success 'split hunk setup' ' git reset --hard && - for i in 10 20 30 40 50 60 - do - echo $i - done >test && + test_write_lines 10 20 30 40 50 60 >test && git add test && test_tick && git commit -m test && - for i in 10 15 20 21 22 23 24 30 40 50 60 - do - echo $i - done >test + test_write_lines 10 15 20 21 22 23 24 30 40 50 60 >test ' test_expect_success 'split hunk "add -p (edit)"' ' @@ -334,17 +321,7 @@ test_expect_success 'split hunk "add -p (edit)"' ' ' test_expect_failure 'split hunk "add -p (no, yes, edit)"' ' - cat >test <<-\EOF && - 5 - 10 - 20 - 21 - 30 - 31 - 40 - 50 - 60 - EOF + test_write_lines 5 10 20 21 30 31 40 50 60 >test && git reset && # test sequence is s(plit), n(o), y(es), e(dit) # q n q q is there to make sure we exit at the end. -- 2.16.1