From: Jeff King <peff@peff.net>
To: Stefan Beller <sbeller@google.com>
Cc: Brandon Williams <bmwill@google.com>,
Junio C Hamano <gitster@pobox.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: [PATCH v2 2/2] t: move "git add submodule" into test blocks
Date: Wed, 14 Jun 2017 06:58:25 -0400 [thread overview]
Message-ID: <20170614105825.zbxdgvcezuilpins@sigill.intra.peff.net> (raw)
In-Reply-To: <20170614105437.cgdlykmtocdj5vzw@sigill.intra.peff.net>
Some submodule tests do some setup outside of a test_expect
block. This is bad because we won't actually check the
outcome of those commands. But it's doubly so because "git
add submodule" now produces a warning to stderr, which is
not suppressed by the test scripts in non-verbose mode.
This patch does the minimal to fix the annoying warnings.
All three of these scripts could use more cleanup of related
setup.
Signed-off-by: Jeff King <peff@peff.net>
---
t/t4041-diff-submodule-option.sh | 8 +++++---
t/t4060-diff-submodule-option-diff-format.sh | 8 +++++---
t/t7401-submodule-summary.sh | 8 +++++---
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
index 2d9731b52..058ee0829 100755
--- a/t/t4041-diff-submodule-option.sh
+++ b/t/t4041-diff-submodule-option.sh
@@ -430,9 +430,11 @@ test_expect_success 'deleted submodule' '
test_cmp expected actual
'
-test_create_repo sm2 &&
-head7=$(add_file sm2 foo8 foo9) &&
-git add sm2
+test_expect_success 'create second submodule' '
+ test_create_repo sm2 &&
+ head7=$(add_file sm2 foo8 foo9) &&
+ git add sm2
+'
test_expect_success 'multiple submodules' '
git diff-index -p --submodule=log HEAD >actual &&
diff --git a/t/t4060-diff-submodule-option-diff-format.sh b/t/t4060-diff-submodule-option-diff-format.sh
index 33ec26d75..4b168d0ed 100755
--- a/t/t4060-diff-submodule-option-diff-format.sh
+++ b/t/t4060-diff-submodule-option-diff-format.sh
@@ -643,9 +643,11 @@ test_expect_success 'deleted submodule' '
test_cmp expected actual
'
-test_create_repo sm2 &&
-head7=$(add_file sm2 foo8 foo9) &&
-git add sm2
+test_expect_success 'create second submodule' '
+ test_create_repo sm2 &&
+ head7=$(add_file sm2 foo8 foo9) &&
+ git add sm2
+'
test_expect_success 'multiple submodules' '
git diff-index -p --submodule=diff HEAD >actual &&
diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh
index 366746f0d..4e4c45550 100755
--- a/t/t7401-submodule-summary.sh
+++ b/t/t7401-submodule-summary.sh
@@ -241,9 +241,11 @@ EOF
test_cmp expected actual
"
-test_create_repo sm2 &&
-head7=$(add_file sm2 foo8 foo9) &&
-git add sm2
+test_expect_success 'create second submodule' '
+ test_create_repo sm2 &&
+ head7=$(add_file sm2 foo8 foo9) &&
+ git add sm2
+'
test_expect_success 'multiple submodules' "
git submodule summary >actual &&
--
2.13.1.766.g6bea926c5
next prev parent reply other threads:[~2017-06-14 10:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-06 3:56 [BUG?] gitlink without .gitmodules no longer fails recursive clone Jeff King
2017-06-06 18:01 ` Stefan Beller
2017-06-06 18:10 ` Brandon Williams
2017-06-06 18:39 ` Jeff King
2017-06-09 23:19 ` Jeff King
2017-06-10 2:10 ` Junio C Hamano
2017-06-10 7:13 ` Jeff King
2017-06-10 11:12 ` Junio C Hamano
2017-06-12 5:30 ` Stefan Beller
2017-06-13 9:14 ` Jeff King
2017-06-13 9:24 ` [PATCH 1/2] add: warn when adding an embedded repository Jeff King
2017-06-13 17:07 ` Stefan Beller
2017-06-13 17:16 ` Brandon Williams
2017-06-14 6:36 ` Jeff King
2017-06-14 10:54 ` [PATCH v2 0/2] " Jeff King
2017-06-14 10:58 ` [PATCH v2 1/2] add: " Jeff King
2017-06-14 10:58 ` Jeff King [this message]
2017-06-14 17:53 ` [PATCH " Stefan Beller
2017-06-15 6:01 ` Jeff King
2017-06-13 17:16 ` Junio C Hamano
2017-06-14 6:38 ` Jeff King
2017-06-13 9:24 ` [PATCH 2/2] t: move "git add submodule" into test blocks Jeff King
2017-06-13 17:15 ` Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170614105825.zbxdgvcezuilpins@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).