git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 6/8] t/README: Document test_expect_code
Date: Thu,  1 Jul 2010 15:10:02 +0000	[thread overview]
Message-ID: <1277997004-29504-7-git-send-email-avarab@gmail.com> (raw)
In-Reply-To: <1277997004-29504-1-git-send-email-avarab@gmail.com>

test_expect_code (which was introduced in d3bfdb75) never had any
documentation.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 t/README |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/t/README b/t/README
index 43d6d4d..6232567 100644
--- a/t/README
+++ b/t/README
@@ -276,6 +276,13 @@ library for your script to use.
    
    Like test_expect_success this function can optionally use a three
    argument invocation with a prerequisite as the first argument.
+   
+ - test_expect_code [<prereq>] <code> <message> <script>
+ 
+   Analogous to test_expect_success, but pass the test if it exits
+   with a given exit <code>
+ 
+ test_expect_code 1 'Merge with d/f conflicts' 'git merge "merge msg" B master'
 
  - test_debug <script>
 
-- 
1.7.1.251.g92a7

  parent reply	other threads:[~2010-07-01 15:16 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-01 15:09 [PATCH 0/8] Improvements for t/README Ævar Arnfjörð Bjarmason
2010-07-01 15:09 ` [PATCH 1/8] t/README: Tests are all +x, ./test, not sh ./test Ævar Arnfjörð Bjarmason
2010-07-01 15:42   ` Jeff King
2010-07-01 15:09 ` [PATCH 2/8] t/README: The trash is in 't/trash directory.$name' Ævar Arnfjörð Bjarmason
2010-07-01 15:44   ` Jeff King
2010-07-01 15:09 ` [PATCH 3/8] t/README: Typo: paralell -> parallel Ævar Arnfjörð Bjarmason
2010-07-01 15:10 ` [PATCH 4/8] t/README: Document the prereq functions, and 3-arg test_* Ævar Arnfjörð Bjarmason
2010-07-01 16:37   ` Junio C Hamano
2010-07-01 15:10 ` [PATCH 5/8] t/README: Document test_external* Ævar Arnfjörð Bjarmason
2010-07-01 16:38   ` Junio C Hamano
2010-07-01 15:10 ` Ævar Arnfjörð Bjarmason [this message]
2010-07-01 15:10 ` [PATCH 7/8] t/README: Add a section about skipping tests Ævar Arnfjörð Bjarmason
2010-07-01 15:10 ` [PATCH 8/8] t/README: Document the dangers of printing "ok" / "not ok" Ævar Arnfjörð Bjarmason
2010-07-01 17:16   ` Junio C Hamano

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1277997004-29504-7-git-send-email-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.
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 NNTP newsgroup(s).