[StGIT PATCH 2/2] Verify patch status during the test
From: Karl Hasselström <hidden>
Date: 2016-06-15 22:43:27
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Karl Hasselström <redacted> --- t/t1200-push-modified.sh | 55 +++++++++++++++++++++++++++------------------- 1 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh
index 324b3b0..0e408d0 100755
--- a/t/t1200-push-modified.sh
+++ b/t/t1200-push-modified.sh@@ -19,23 +19,26 @@ specify --merged, then rollback and retry with the correct flag.' test_create_repo foo test_expect_success \ - 'Clone tree and setup changes' \ - "stg clone foo bar && - (cd bar && stg new p1 -m p1 && - printf 'a\nc\n' > file && stg add file && stg refresh && - stg new p2 -m p2 && - printf 'a\nb\nc\n' > file && stg refresh - ) -" + 'Clone tree and setup changes' ' + stg clone foo bar && + ( + cd bar && stg new p1 -m p1 && + printf "a\nc\n" > file && stg add file && stg refresh && + stg new p2 -m p2 && + printf "a\nb\nc\n" > file && stg refresh && + [ "$(echo $(stg applied))" = "p1 p2" ] && + [ "$(echo $(stg unapplied))" = "" ] + ) +' test_expect_success \ - 'Port those patches to orig tree' \ - '(cd foo && - GIT_DIR=../bar/.git git-format-patch --stdout \ - $(cd ../bar && stg id base@master)..HEAD | - git-am -3 -k - ) - ' + 'Port those patches to orig tree' ' + ( + cd foo && + GIT_DIR=../bar/.git git-format-patch --stdout \ + $(cd ../bar && stg id base@master)..HEAD | git-am -3 -k + ) +' test_expect_success \ 'Pull to sync with parent, preparing for the problem' \
@@ -51,15 +54,21 @@ test_expect_failure \ " test_expect_success \ - 'Rollback the push' \ - "(cd bar && stg push --undo - ) -" + 'Rollback the push' ' + ( + cd bar && stg push --undo && + [ "$(echo $(stg applied))" = "" ] && + [ "$(echo $(stg unapplied))" = "p1 p2" ] + ) +' test_expect_success \ - 'Push those patches while checking they were merged upstream' \ - "(cd bar && stg push --merged --all - ) -" + 'Push those patches while checking they were merged upstream' ' + ( + cd bar && stg push --merged --all + [ "$(echo $(stg applied))" = "p1 p2" ] && + [ "$(echo $(stg unapplied))" = "" ] + ) +' test_done