Skip to contentSkip to conversation

tests(scalar): tighten the stale `scalar.repo` test some

PATCH In review Johannes Schindelin via GitGitGadget 3 participants 3 messages Nov 10, 2022 – Nov 11, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests(scalar): tighten the stale `scalar.repo` test some

From: Johannes Schindelin <[email protected]>

As pointed out by Stolee, the previous incarnation of this test case was not stringent enough: we want to verify that _only_ the stale entries are removed (previously, the test case would have succeeded even if all entries had been removed).

Let's rectify this and verify that the other entries are left intact.

---
tests(scalar): tighten the stale scalar.repo test some

A follow-up for a topic already in next.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1415%2Fdscho%2Ftighten-stale-scalar.repos-test-case-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1415/dscho/tighten-stale-scalar.repos-test-case-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1415

 t/t9210-scalar.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
t/t9210-scalar.sh +4 -1
index c7f8a379108..25f500cf682 100755
@@ -171,10 +171,13 @@ test_expect_success '`reconfigure -a` removes stale config entries' '
 	scalar register stale &&
 	scalar list >scalar.repos &&
 	grep stale scalar.repos &&
+
+	grep -v stale scalar.repos >expect &&
+
 	rm -rf stale &&
 	scalar reconfigure -a &&
 	scalar list >scalar.repos &&
-	! grep stale scalar.repos
+	test_cmp expect scalar.repos
 '
 
 test_expect_success 'scalar delete without enlistment shows a usage' '

base-commit: c90db53d203d7ade1dc7abe63857cfb5616fe34f

Signature · 1 line
gitgitgadget
#1 lore raw
Quoted 6 lines · Johannes Schindelin via GitGitGadget

From: Johannes Schindelin <[email protected]>

As pointed out by Stolee, the previous incarnation of this test case was not stringent enough: we want to verify that _only_ the stale entries are removed (previously, the test case would have succeeded even if all entries had been removed).

Thanks for tightening the test!

LGTM.
-Stolee

#2 lore raw
Quoted 9 lines · Derrick Stolee
Quoted 6 lines · Johannes Schindelin via GitGitGadget

From: Johannes Schindelin <[email protected]>

As pointed out by Stolee, the previous incarnation of this test case was not stringent enough: we want to verify that _only_ the stale entries are removed (previously, the test case would have succeeded even if all entries had been removed).

Thanks for tightening the test!

Thanks, both. I merged this back into 'js/remove-stale-scalar-repos' and will re-merge it back into 'next' during the next push-out (probably on Monday or Tuesday of next week).

Thanks,
Taylor