git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 5/9] t6030: explicitly test for bisection cleanup

From
Pranit Bauva <pranit.bauva@gmail.com>
Date
Jul 12, 2016, 22:35 UTC
Message-ID
<20160712223538.28508-6-pranit.bauva@gmail.com>
In-Reply-To
<20160712223538.28508-1-pranit.bauva@gmail.com>

Add test to explicitly check that 'git bisect reset' is working as expected. This is already covered implicitly by the test suite.

Mentored-by: Lars Schneider <larsxschneider@gmail.com>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>

--- I faced this problem while converting `bisect_clean_state` and the tests where showing breakages but it wasn't clear as to where exactly are they breaking. This will patch will help in that. Also I tested the test coverage of the test suite before this patch and it covers this (I did this by purposely changing names of files in git-bisect.sh and running the test suite).

Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
---
 t/t6030-bisect-porcelain.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index e74662b..a17f7a6 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -894,4 +894,21 @@ test_expect_success 'bisect start takes options and revs in any order' '
 	test_cmp expected actual
 '
 
+test_expect_success 'git bisect reset cleans bisection state properly' '
+	git bisect reset &&
+	git bisect start &&
+	git bisect good $HASH1 &&
+	git bisect bad $HASH4 &&
+	git bisect reset &&
+	test -z "$(git for-each-ref "refs/bisect/*")" &&
+	test_path_is_missing "$GIT_DIR/BISECT_EXPECTED_REV" &&
+	test_path_is_missing "$GIT_DIR/BISECT_ANCESTORS_OK" &&
+	test_path_is_missing "$GIT_DIR/BISECT_LOG" &&
+	test_path_is_missing "$GIT_DIR/BISECT_RUN" &&
+	test_path_is_missing "$GIT_DIR/BISECT_TERMS" &&
+	test_path_is_missing "$GIT_DIR/head-name" &&
+	test_path_is_missing "$GIT_DIR/BISECT_HEAD" &&
+	test_path_is_missing "$GIT_DIR/BISECT_START"
+'
+
 test_done
-- 
2.9.0
Previous: Pranit BauvaNext: Pranit Bauva
Message 7 of 12 in “Resend of gitster/pb/bisect”
  1. 0/9 Resend of gitster/pb/bisectPranit Bauva, Jul 12, 2016
  2. 2/9 bisect: rewrite `check_term_format` shell function in CPranit Bauva, Jul 12, 2016
  3. 3/9 bisect--helper: `write_terms` shell function in CPranit Bauva, Jul 12, 2016
  4. 1/9 bisect--helper: use OPT_CMDMODE instead of OPT_BOOLPranit Bauva, Jul 12, 2016
  5. 6/9 wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()Pranit Bauva, Jul 12, 2016
  6. 4/9 bisect--helper: `bisect_clean_state` shell function in CPranit Bauva, Jul 12, 2016
  7. 5/9 t6030: explicitly test for bisection cleanupPranit Bauva, Jul 12, 2016
  8. 9/9 bisect--helper: `bisect_write` shell function in CPranit Bauva, Jul 12, 2016
  9. 7/9 bisect--helper: `bisect_reset` shell function in CPranit Bauva, Jul 12, 2016
  10. 8/9 bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in CPranit Bauva, Jul 12, 2016
  11. Christian CouderJul 13, 2016
  12. Pranit BauvaJul 20, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.