From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com, Jens.Lehmann@web.de
Cc: git@vger.kernel.org, mst@redhat.com, Stefan Beller <sbeller@google.com>
Subject: [PATCHv2 2/6] t7408: merge short tests, factor out testing method
Date: Fri, 5 Aug 2016 18:23:14 -0700 [thread overview]
Message-ID: <20160806012318.17968-3-sbeller@google.com> (raw)
In-Reply-To: <20160806012318.17968-1-sbeller@google.com>
Tests consisting of one line each can be consolidated to have fewer tests
to run as well as fewer lines of code.
When having just a few git commands, do not create a new shell but
use the -C flag in Git to execute in the correct directory.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
t/t7408-submodule-reference.sh | 49 +++++++++++++++---------------------------
1 file changed, 17 insertions(+), 32 deletions(-)
diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh
index beee0bb..1d9326e 100755
--- a/t/t7408-submodule-reference.sh
+++ b/t/t7408-submodule-reference.sh
@@ -8,6 +8,15 @@ test_description='test clone --reference'
base_dir=$(pwd)
+test_alternate_usage() {
+ alternates_file="$1" &&
+ working_dir="$2" &&
+ test_line_count = 1 "$alternates_file" &&
+ echo "0 objects, 0 kilobytes" >expect &&
+ git -C "$working_dir" count-objects >actual &&
+ test_cmp expect actual
+}
+
test_expect_success 'preparing first repository' '
test_create_repo A &&
(
@@ -40,44 +49,20 @@ test_expect_success 'preparing superproject' '
)
'
-test_expect_success 'submodule add --reference' '
+test_expect_success 'submodule add --reference uses alternates' '
(
cd super &&
git submodule add --reference ../B "file://$base_dir/A" sub &&
git commit -m B-super-added
- )
-'
-
-test_expect_success 'after add: existence of info/alternates' '
- test_line_count = 1 super/.git/modules/sub/objects/info/alternates
-'
-
-test_expect_success 'that reference gets used with add' '
- (
- cd super/sub &&
- echo "0 objects, 0 kilobytes" > expected &&
- git count-objects > current &&
- diff expected current
- )
-'
-
-test_expect_success 'cloning superproject' '
- git clone super super-clone
-'
-
-test_expect_success 'update with reference' '
- cd super-clone && git submodule update --init --reference ../B
-'
-
-test_expect_success 'after update: existence of info/alternates' '
- test_line_count = 1 super-clone/.git/modules/sub/objects/info/alternates
+ ) &&
+ test_alternate_usage super/.git/modules/sub/objects/info/alternates super/sub
'
-test_expect_success 'that reference gets used with update' '
- cd super-clone/sub &&
- echo "0 objects, 0 kilobytes" > expected &&
- git count-objects > current &&
- diff expected current
+test_expect_success 'updating superproject keeps alternates' '
+ test_when_finished "rm -rf super-clone" &&
+ git clone super super-clone &&
+ git -C super-clone submodule update --init --reference ../B &&
+ test_alternate_usage super-clone/.git/modules/sub/objects/info/alternates super-clone/sub
'
test_done
--
2.9.2.572.g9d9644e.dirty
next prev parent reply other threads:[~2016-08-06 20:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-06 1:23 [PATCHv2 0/6] git clone: Marry --recursive and --reference Stefan Beller
2016-08-06 1:23 ` [PATCHv2 1/6] t7408: modernize style Stefan Beller
2016-08-06 1:23 ` Stefan Beller [this message]
2016-08-06 17:02 ` [PATCHv2 2/6] t7408: merge short tests, factor out testing method Junio C Hamano
2016-08-06 1:23 ` [PATCHv2 3/6] submodule--helper module-clone: allow multiple references Stefan Beller
2016-08-06 1:23 ` [PATCHv2 4/6] submodule--helper update-clone: " Stefan Beller
2016-08-06 17:05 ` Junio C Hamano
2016-08-06 1:23 ` [PATCHv2 5/6] submodule update: add super-reference flag Stefan Beller
2016-08-06 17:13 ` Junio C Hamano
2016-08-06 1:23 ` [PATCHv2 6/6] clone: reference flag is used for submodules as well Stefan Beller
2016-08-06 17:29 ` [PATCHv2 0/6] git clone: Marry --recursive and --reference Junio C Hamano
2016-08-08 18:16 ` 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=20160806012318.17968-3-sbeller@google.com \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mst@redhat.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).