From: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
To: git@vger.kernel.org
Cc: Remi Galan <remi.galan-alfonso@ensimag.grenoble-inp.fr>,
Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>,
Guillaume Pages <guillaume.pages@ensimag.grenoble-inp.fr>,
Louis-Alexandre Stuber
<louis--alexandre.stuber@ensimag.grenoble-inp.fr>,
Antoine Delaite <antoine.delaite@ensimag.grenoble-inp.fr>,
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Subject: [PATCH 2/3] t4150-am: refactor am -3 tests
Date: Tue, 26 May 2015 23:32:54 +0200 [thread overview]
Message-ID: <1432675975-11020-2-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr> (raw)
In-Reply-To: <1432675975-11020-1-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr>
Move the creation of the file, commit and branch used in git am -3 tests
in a setup test, to avoid creating this setup several time.
Signed-off-by: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
---
t/t4150-am.sh | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 8370951..8f85098 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -272,13 +272,17 @@ test_expect_success 'am --keep-non-patch really keeps the non-patch part' '
grep "^\[foo\] third" actual
'
+test_expect_success 'setup: am -3' '
+ setup_fixed_branch lorem2 master2 &&
+ sed -n -e "3,\$p" msg >file &&
+ head -n 9 msg >>file &&
+ git add file &&
+ test_tick &&
+ git commit -m "copied stuff"
+'
+
test_expect_success 'am -3 falls back to 3-way merge' '
+ setup_temporary_branch lorem2 &&
- setup_fixed_branch lorem2 master2 &&
- sed -n -e "3,\$p" msg >file &&
- head -n 9 msg >>file &&
- git add file &&
- test_tick &&
- git commit -m "copied stuff" &&
git am -3 lorem-move.patch &&
test_path_is_missing .git/rebase-apply &&
git diff --exit-code lorem
@@ -286,11 +290,6 @@ test_expect_success 'am -3 falls back to 3-way merge' '
test_expect_success 'am -3 -p0 can read --no-prefix patch' '
setup_temporary_branch lorem2 &&
- sed -n -e "3,\$p" msg >file &&
- head -n 9 msg >>file &&
- git add file &&
- test_tick &&
- git commit -m "copied stuff" &&
git am -3 -p0 lorem-zero.patch &&
test_path_is_missing .git/rebase-apply &&
git diff --exit-code lorem
@@ -325,11 +324,6 @@ test_expect_success 'am -3 can rename a file after falling back to 3-way merge'
test_expect_success 'am -3 -q is quiet' '
setup_temporary_branch lorem2 &&
- sed -n -e "3,\$p" msg >file &&
- head -n 9 msg >>file &&
- git add file &&
- test_tick &&
- git commit -m "copied stuff" &&
git am -3 -q lorem-move.patch >output.out 2>&1 &&
! test -s output.out
'
--
1.9.1
next prev parent reply other threads:[~2015-05-26 21:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-26 21:32 [PATCH 1/3] t4150-am: refactor and clean common setup Remi Lespinet
2015-05-26 21:32 ` Remi Lespinet [this message]
2015-05-26 21:32 ` [PATCH 3/3] git-am: add am.threeWay config variable Remi Lespinet
2015-05-28 13:47 ` Paul Tan
2015-05-28 17:57 ` Junio C Hamano
2015-05-28 19:20 ` Matthieu Moy
2015-05-28 13:10 ` [PATCH 1/3] t4150-am: refactor and clean common setup Paul Tan
2015-05-28 18:15 ` Eric Sunshine
2015-05-29 11:50 ` Remi LESPINET
2015-05-28 19:09 ` Eric Sunshine
2015-05-28 19:18 ` Eric Sunshine
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=1432675975-11020-2-git-send-email-remi.lespinet@ensimag.grenoble-inp.fr \
--to=remi.lespinet@ensimag.grenoble-inp.fr \
--cc=antoine.delaite@ensimag.grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=guillaume.pages@ensimag.grenoble-inp.fr \
--cc=louis--alexandre.stuber@ensimag.grenoble-inp.fr \
--cc=matthieu.moy@grenoble-inp.fr \
--cc=remi.galan-alfonso@ensimag.grenoble-inp.fr \
/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).