From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: pclouds@gmail.com, Jens.Lehmann@web.de, jacob.keller@gmail.com,
Stefan Beller <sbeller@google.com>
Subject: [PATCH 4/4] submodule: add more tests for recursive submodule behavior
Date: Thu, 24 Mar 2016 16:34:28 -0700 [thread overview]
Message-ID: <1458862468-12460-5-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1458862468-12460-1-git-send-email-sbeller@google.com>
This adds a test for "submodule update", wich calls "submodule update"
from an untracked repository in the superproject. When doing creating
the parent patch a similar test failed for "submodule sync", but
all tests passed for "submodule update". It took me a long time
to figure out this was a difference in test coverage instead of
commands behaving differently. Let's improve the test coverage such
to make it a better place.
When trying to fix the issue in the parent patch I could get
the test suite passing when removing the $@ argument from module_list
in the sync command. This also indicates a low test coverage, so
fix that.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
t/t7403-submodule-sync.sh | 13 +++++++++----
t/t7406-submodule-update.sh | 12 ++++++++++++
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index 79bc135..5dde123 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -28,6 +28,9 @@ test_expect_success setup '
git submodule add ../submodule submodule &&
test_tick &&
git commit -m "submodule"
+ git submodule add ../submodule submodule2 &&
+ test_tick &&
+ git commit -m "second submodule"
) &&
git clone super super-clone &&
(
@@ -149,15 +152,16 @@ test_expect_success 'reset submodule URLs' '
reset_submodule_urls super-clone
'
-test_expect_success '"git submodule sync" should update submodule URLs - subdirectory' '
+test_expect_success '"git submodule sync" should update specified submodule URLs - subdirectory' '
(
cd super-clone &&
git pull --no-recurse-submodules &&
mkdir -p sub &&
cd sub &&
- git submodule sync >../../output
+ git submodule sync ../submodule >../../output
) &&
grep "\\.\\./submodule" output &&
+ ! grep submodule2 output &&
test -d "$(
cd super-clone/submodule &&
git config remote.origin.url
@@ -177,7 +181,7 @@ test_expect_success '"git submodule sync" should update submodule URLs - subdire
)
'
-test_expect_success '"git submodule sync --recursive" should update all submodule URLs - subdirectory' '
+test_expect_success '"git submodule sync --recursive" should update all specified submodule URLs - subdirectory' '
(
cd super-clone &&
(
@@ -186,9 +190,10 @@ test_expect_success '"git submodule sync --recursive" should update all submodul
) &&
mkdir -p sub &&
cd sub &&
- git submodule sync --recursive >../../output
+ git submodule sync --recursive ../submodule >../../output
) &&
grep "\\.\\./submodule/sub-submodule" output &&
+ ! grep submodule2 output &&
test -d "$(
cd super-clone/submodule &&
git config remote.origin.url
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 68ea31d..628da7f 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -774,4 +774,16 @@ test_expect_success 'submodule update --recursive drops module name before recur
test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual
)
'
+
+test_expect_success 'submodule update --recursive works from subdirectory' '
+ (cd super2 &&
+ (cd deeper/submodule/subsubmodule &&
+ git checkout HEAD^
+ ) &&
+ mkdir untracked &&
+ cd untracked &&
+ git submodule update --recursive >actual &&
+ test_i18ngrep "Submodule path .../deeper/submodule/subsubmodule.: checked out" actual
+ )
+'
test_done
--
2.8.0.rc4.10.g52f3f33
next prev parent reply other threads:[~2016-03-24 23:34 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-24 23:34 [PATCHv2 0/4] submodule helper: cleanup prefix passing Stefan Beller
2016-03-24 23:34 ` [PATCH 1/4] submodule: fix recursive path printing from non root directory Stefan Beller
2016-03-24 23:38 ` Jacob Keller
2016-03-24 23:44 ` Stefan Beller
2016-03-25 16:43 ` Junio C Hamano
2016-03-25 16:54 ` Stefan Beller
2016-03-24 23:34 ` [PATCH 2/4] submodule: fix recursive execution " Stefan Beller
2016-03-24 23:41 ` Jacob Keller
2016-03-25 16:46 ` Junio C Hamano
2016-03-25 17:27 ` Stefan Beller
2016-03-24 23:34 ` [PATCH 3/4] submodule--helper list: lose the extra prefix option Stefan Beller
2016-03-24 23:44 ` Jacob Keller
2016-03-25 6:28 ` Junio C Hamano
2016-03-25 16:02 ` Junio C Hamano
2016-03-25 17:25 ` Junio C Hamano
2016-03-25 17:31 ` Stefan Beller
2016-03-25 16:49 ` Stefan Beller
2016-03-25 17:01 ` Junio C Hamano
2016-03-25 17:05 ` Stefan Beller
2016-03-25 18:32 ` Junio C Hamano
2016-03-24 23:34 ` Stefan Beller [this message]
2016-03-25 0:25 ` [PATCH 4/4] submodule: add more tests for recursive submodule behavior Eric Sunshine
2016-03-25 0:33 ` 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=1458862468-12460-5-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=pclouds@gmail.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).